diff --git a/setup.py b/setup.py
index 2fae24da..6847683b 100755
--- a/setup.py
+++ b/setup.py
@@ -2255,6 +2255,11 @@ def configureSystem(self):
         self.createUsers()
         self.makeFolders()
 
+        if self.install_couchbase:
+            self.writePersistType('couchbase')
+        else:
+            self.writePersistType('ldap')
+
     def make_salt(self):
         try:
             f = open("%s/salt" % self.configFolder, 'w')
@@ -2270,6 +2275,16 @@ def make_oxauth_salt(self):
         self.pairwiseCalculationKey = self.genRandomString(random.randint(20,30))
         self.pairwiseCalculationSalt = self.genRandomString(random.randint(20,30))
 
+
+    def writePersistType(self, ptype):
+        self.logIt("Writing persist type")
+        fname = os.path.join(self.configFolder, 'gluu.properties')
+        fcontent = 'persistence.type={}'.format(ptype)
+
+        print "writing", fname, fcontent
+
+        self.writeFile(fname, fcontent)
+
     def promptForProperties(self):
 
         promptForMITLicense = self.getPrompt("Do you acknowledge that use of the Gluu Server is under the MIT license?","N|y")[0].lower()
@@ -2370,7 +2385,6 @@ def promptForProperties(self):
             else:
                 option = 1
 
-
             if option == 1:
                 self.ldap_type = 'opendj'
             elif option == 2: