diff --git a/workflow/engine/classes/class.system.php b/workflow/engine/classes/class.system.php
index 938f947b4..0b530e43e 100755
--- a/workflow/engine/classes/class.system.php
+++ b/workflow/engine/classes/class.system.php
@@ -1021,12 +1021,13 @@ class System {
       if (defined('PATH_DB')) { // if we're on a valid workspace env.
         if (empty($wsName)) {
           $uriParts = explode('/', getenv("REQUEST_URI"));
-          
-          if (substr($uriParts[1], 0, 3 ) == 'sys') {
-            $wsName = substr($uriParts[1], 3);
+
+          if (isset($uriParts[1])) {
+            if (substr($uriParts[1], 0, 3 ) == 'sys') {
+              $wsName = substr($uriParts[1], 3);
+            }
           }
         }
-        
         $wsIniFile = PATH_DB . $wsName . PATH_SEP . 'env.ini';
       }
     }
diff --git a/workflow/engine/methods/users/usersAjax.php b/workflow/engine/methods/users/usersAjax.php
index 4587002f6..3297d7e44 100644
--- a/workflow/engine/methods/users/usersAjax.php
+++ b/workflow/engine/methods/users/usersAjax.php
@@ -556,7 +556,7 @@ switch($_POST['action'])
     } else {
       $color = 'green';
       $img = '/images/dialog-ok-apply.png';
-      $aFields['DESCRIPTION'] .= G::LoadTranslation('ID_PASSWORD_COMPLIES_POLICIES') . '</span>';
+      $aFields['DESCRIPTION'] = G::LoadTranslation('ID_PASSWORD_COMPLIES_POLICIES') . '</span>';
       $aFields['STATUS'] = true;  
     }
     $span = '<span style="color: ' . $color . '; font: 9px tahoma,arial,helvetica,sans-serif;">';
diff --git a/workflow/engine/methods/users/usersEdit.php b/workflow/engine/methods/users/usersEdit.php
index e2fcaa8e7..3c701e7b9 100644
--- a/workflow/engine/methods/users/usersEdit.php
+++ b/workflow/engine/methods/users/usersEdit.php
@@ -14,6 +14,7 @@ if ( $postMaxSize < $uploadMaxSize ) $uploadMaxSize = $postMaxSize;
 
 $oHeadPublisher =& headPublisher::getSingleton(); 
 $oHeadPublisher->addExtJsScript('users/users', true );    //adding a javascript file .js
-$oHeadPublisher->assign('USR_UID', $_GET['USR_UID']);    
+$oHeadPublisher->assign('USR_UID', $_GET['USR_UID']);
+$oHeadPublisher->assign('MODE', $_GET['MODE']);
 $oHeadPublisher->assign('MAX_FILES_SIZE', ' (' . $UPLOAD_MAX_SIZE . ') ');
 G::RenderPage('publish', 'extJs');  
diff --git a/workflow/engine/methods/users/usersNew.php b/workflow/engine/methods/users/usersNew.php
index f74cf1e3a..039019d90 100644
--- a/workflow/engine/methods/users/usersNew.php
+++ b/workflow/engine/methods/users/usersNew.php
@@ -16,5 +16,6 @@ if ( $postMaxSize < $uploadMaxSize ) $uploadMaxSize = $postMaxSize;
 $oHeadPublisher =& headPublisher::getSingleton();
 $oHeadPublisher->addExtJsScript('users/users', true );    //adding a javascript file .js
 $oHeadPublisher->assign('USR_UID', '');
+$oHeadPublisher->assign('MODE', $_GET['MODE']);
 $oHeadPublisher->assign('MAX_FILES_SIZE', ' (' . $UPLOAD_MAX_SIZE . ') ');
 G::RenderPage('publish', 'extJs');
diff --git a/workflow/engine/templates/users/users.js b/workflow/engine/templates/users/users.js
index 6123e251c..d5efc813d 100644
--- a/workflow/engine/templates/users/users.js
+++ b/workflow/engine/templates/users/users.js
@@ -32,7 +32,10 @@ Ext.onReady(function() {
     }
     
   });
-
+  
+  if (MODE == 'edit')
+    flagPoliciesPassword = true;
+    
   //EDIT MODE
   if (USR_UID != '') {
     allowBlackStatus = true;
diff --git a/workflow/engine/templates/users/usersList.js b/workflow/engine/templates/users/usersList.js
index 6301b62c6..15c9cc70d 100755
--- a/workflow/engine/templates/users/usersList.js
+++ b/workflow/engine/templates/users/usersList.js
@@ -403,7 +403,7 @@ DoNothing = function(){};
 
 //Open New User Form
 NewUserAction = function(){
-  location.href = 'usersNew';
+  location.href = 'usersNew?MODE=new';
 };
 
 //Delete User Action
@@ -469,7 +469,7 @@ SummaryTabOpen = function(){
 EditUserAction = function(){
   var uid = infoGrid.getSelectionModel().getSelected();
   if (uid) {
-    location.href = 'usersEdit?USR_UID=' + uid.data.USR_UID+'&USR_AUTH_SOURCE=' + uid.data.USR_AUTH_SOURCE;
+    location.href = 'usersEdit?USR_UID=' + uid.data.USR_UID+'&USR_AUTH_SOURCE=' + uid.data.USR_AUTH_SOURCE+'&MODE=edit';
   }
 };