diff --git a/workflow/engine/controllers/newSiteProxy.php b/workflow/engine/controllers/newSiteProxy.php
index 969454bef..88726845d 100644
--- a/workflow/engine/controllers/newSiteProxy.php
+++ b/workflow/engine/controllers/newSiteProxy.php
@@ -30,9 +30,9 @@ class newSiteProxy extends HttpProxyController
                     return;
                 }
             }
-            $user = (isset( $_POST['NW_USERNAME'] )) ? trim( $_POST['NW_USERNAME'] ) : 'admin';
-            $pass = (isset( $_POST['NW_PASSWORD'] )) ? $_POST['NW_PASSWORD'] : 'admin';
-            $pass1 = (isset( $_POST['NW_PASSWORD2'] )) ? $_POST['NW_PASSWORD2'] : 'admin';
+            $user = (isset($_POST['NW_USERNAME'])) ? trim($_POST['NW_USERNAME']) : 'admin';
+            $pass = (isset($_POST['NW_PASSWORD'])) ? trim($_POST['NW_PASSWORD']) : 'admin';
+            $pass1 = (isset($_POST['NW_PASSWORD2'])) ? trim($_POST['NW_PASSWORD2']) : 'admin';
 
 
             $ao_db_wf = (isset( $_POST['AO_DB_WF'] )) ? $_POST['AO_DB_WF'] : false;
diff --git a/workflow/engine/templates/installer/installer_cards.js b/workflow/engine/templates/installer/installer_cards.js
index 94409b8e1..a754ce411 100644
--- a/workflow/engine/templates/installer/installer_cards.js
+++ b/workflow/engine/templates/installer/installer_cards.js
@@ -744,6 +744,10 @@ Ext.onReady(function(){
                     id: 'adminPassword',
                     enableKeyEvents: true,
                     allowBlank: false,
+                    validator: function (v) {
+                        v = v.trim();
+                        return !/^\s+$/.test(v);
+                    },
                     listeners: {keyup: function() {
                       wizard.onClientValidation(4, false);
                     }}
@@ -755,6 +759,10 @@ Ext.onReady(function(){
                     id : 'confirmPassword',
                     enableKeyEvents: true,
                     allowBlank: false,
+                    validator: function (v) {
+                        v = v.trim();
+                        return !/^\s+$/.test(v.trim());
+                    },
                     listeners: {keyup: function() {
                       wizard.onClientValidation(4, false);
                     }}
diff --git a/workflow/engine/templates/setup/newSite.js b/workflow/engine/templates/setup/newSite.js
index 7306a1c56..8d08c7164 100644
--- a/workflow/engine/templates/setup/newSite.js
+++ b/workflow/engine/templates/setup/newSite.js
@@ -100,7 +100,11 @@ Ext.onReady(function(){
         inputType:'password',
         value:'admin',
         width: 200,
-        allowBlank: false
+        allowBlank: false,
+          validator: function (v) {
+              v = v.trim();
+              return !/^\s+$/.test(v);
+          }
       },
       {
         id: 'NW_PASSWORD2',
@@ -109,7 +113,11 @@ Ext.onReady(function(){
         inputType:'password',
         value:'admin',
         width: 200,
-        allowBlank: false
+        allowBlank: false,
+          validator: function (v) {
+              v = v.trim();
+              return !/^\s+$/.test(v);
+          }
       }
       ]
   });
@@ -173,11 +181,9 @@ Ext.onReady(function(){
                              aoDbRb     =aoDbWf;
                              aoDbRp     =aoDbWf;
                              nwUsername =formNewSite.getForm().findField('NW_USERNAME').getValue();
-                             nwPassword =formNewSite.getForm().findField('NW_PASSWORD').getValue();
-                             nwPassword2=formNewSite.getForm().findField('NW_PASSWORD2').getValue();
+                             nwPassword = formNewSite.getForm().findField('NW_PASSWORD').getValue().trim();
+                             nwPassword2 = formNewSite.getForm().findField('NW_PASSWORD2').getValue().trim();
                              aoDbDrop=formNewSite.getForm().findField('AO_DB_DROP').getValue();
-                             //Ext.getCmp('NW_TITLE').disable()=true;
-                             //Ext.getCmp('NW_TITLE').readOnly = true;
                              createNW(nwTitle, aoDbWf, aoDbRb, aoDbRp, nwUsername, nwPassword, nwPassword2);
                             },
                             failure: function(f,a){