diff --git a/source/scripting/python/samba/getopt.py b/source/scripting/python/samba/getopt.py
index 9ecb66e21c1..c12245f6c57 100644
--- a/source/scripting/python/samba/getopt.py
+++ b/source/scripting/python/samba/getopt.py
@@ -21,6 +21,7 @@
 
 import optparse
 from credentials import Credentials, AUTO_USE_KERBEROS, DONT_USE_KERBEROS, MUST_USE_KERBEROS
+from hostconfig import Hostconfig
 
 __docformat__ = "restructuredText"
 
@@ -52,6 +53,9 @@ class SambaOptions(optparse.OptionGroup):
             lp.load_default()
         return lp
 
+    def get_hostconfig(self):
+        return Hostconfig(self.get_loadparm())
+
 
 class VersionOptions(optparse.OptionGroup):
     """Command line option for printing Samba version."""
diff --git a/source/scripting/python/samba/hostconfig.py b/source/scripting/python/samba/hostconfig.py
new file mode 100644
index 00000000000..313e3420b0d
--- /dev/null
+++ b/source/scripting/python/samba/hostconfig.py
@@ -0,0 +1,33 @@
+#!/usr/bin/python
+
+# Unix SMB/CIFS implementation.
+# Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2008
+#   
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#   
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#   
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+from samdb import SamDB
+
+class Hostconfig(object):
+    """Aggregate object that contains all information about the configuration 
+    of a Samba host."""
+
+    def __init__(self, lp):       
+        self.lp = lp
+
+    def get_samdb(self, session_info, credentials):
+        return SamDB(url=self.lp.get("sam database"), 
+                     session_info=session_info, credentials=credentials, 
+                     lp=self.lp)
+
diff --git a/source/setup/newuser b/source/setup/newuser
index e6ab4eda2be..5b677af142c 100755
--- a/source/setup/newuser
+++ b/source/setup/newuser
@@ -15,7 +15,6 @@ import samba.getopt as options
 import optparse
 from getpass import getpass
 from samba.auth import system_session
-from samba.samdb import SamDB
 
 parser = optparse.OptionParser("newuser [options] <username> [<password>]")
 sambaopts = options.SambaOptions(parser)
@@ -44,6 +43,6 @@ if opts.unixname is None:
 lp = sambaopts.get_loadparm()
 creds = credopts.get_credentials(lp)
 
-samdb = SamDB(url=lp.get("sam database"), session_info=system_session(), 
-              credentials=creds, lp=lp)
+samdb = sambaopts.get_hostconfig().get_samdb(session_info=system_session(), 
+		                                     credentials=creds)
 samdb.newuser(username, opts.unixname, password)