diff --git a/workflow/engine/classes/model/Users.php b/workflow/engine/classes/model/Users.php
index 469c944ca..7197e83ed 100755
--- a/workflow/engine/classes/model/Users.php
+++ b/workflow/engine/classes/model/Users.php
@@ -138,9 +138,9 @@ class Users extends BaseUsers
                 $aIsoSubdivision = IsoSubdivision::findById( $aFields['USR_COUNTRY'], $aFields['USR_CITY'] );
                 $aIsoLocation = IsoLocation::findById( $aFields['USR_COUNTRY'], $aFields['USR_CITY'], $aFields['USR_LOCATION'] );
 
-                $aFields['USR_COUNTRY_NAME'] = $aIsoCountry['IC_NAME'];
-                $aFields['USR_CITY_NAME'] = $aIsoSubdivision['IS_NAME'];
-                $aFields['USR_LOCATION_NAME'] = $aIsoLocation['IL_NAME'];
+                $aFields["USR_COUNTRY_NAME"]  = (!empty($aIsoCountry["IC_NAME"]))? $aIsoCountry["IC_NAME"] : "";
+                $aFields["USR_CITY_NAME"]     = (!empty($aIsoSubdivision["IS_NAME"]))? $aIsoSubdivision["IS_NAME"] : "";
+                $aFields["USR_LOCATION_NAME"] = (!empty($aIsoLocation["IL_NAME"]))? $aIsoLocation["IL_NAME"] : "";
 
                 $result = $aFields;
 
diff --git a/workflow/engine/methods/users/usersAjax.php b/workflow/engine/methods/users/usersAjax.php
index 70e7f313a..642fce848 100644
--- a/workflow/engine/methods/users/usersAjax.php
+++ b/workflow/engine/methods/users/usersAjax.php
@@ -489,10 +489,6 @@ switch ($_POST['action']) {
 
         $aFields['CASES_MENUSELECTED_NAME'] = $casesMenuSelected;
 
-        $aFields['USR_COUNTRY_NAME'] = (! empty( $aFields['USR_COUNTRY_NAME'] )) ? $aFields['USR_COUNTRY_NAME'] : '';
-        $aFields['USR_CITY_NAME'] = (! empty( $aFields['USR_CITY_NAME'] )) ? $aFields['USR_CITY_NAME'] : '';
-        $aFields['USR_LOCATION_NAME'] = (! empty( $aFields['USR_LOCATION_NAME'] )) ? $aFields['USR_LOCATION_NAME'] : '';
-
         $result->success = true;
         $result->user = $aFields;
 
diff --git a/workflow/engine/methods/users/usersGroups.php b/workflow/engine/methods/users/usersGroups.php
index c4b13c737..86ad80716 100755
--- a/workflow/engine/methods/users/usersGroups.php
+++ b/workflow/engine/methods/users/usersGroups.php
@@ -82,13 +82,16 @@ switch ($_REQUEST['type']) {
         break;
 }
 
-$users = Array ();
-$users['USR_UID'] = $_GET['uUID'];
-$users['USR_FIRSTNAME'] = $aRow['USR_FIRSTNAME'];
-$users['USR_LASTNAME'] = $aRow['USR_LASTNAME'];
-$users['USR_USERNAME'] = $aRow['USR_USERNAME'];
-$users['fullNameFormat'] = $Config['fullNameFormat'];
-$users['CURRENT_TAB'] = $ctab;
+$arrayAuthSources = $RBAC->getAllAuthSourcesByUser();
+
+$users = array();
+$users["USR_UID"] = $_GET["uUID"];
+$users["USR_FIRSTNAME"] = $aRow["USR_FIRSTNAME"];
+$users["USR_LASTNAME"]  = $aRow["USR_LASTNAME"];
+$users["USR_USERNAME"]  = $aRow["USR_USERNAME"];
+$users["USR_AUTH_SOURCE"] = (isset($arrayAuthSources[$_GET["uUID"]]))? $arrayAuthSources[$_GET["uUID"]] : "ProcessMaker (MYSQL)";
+$users["fullNameFormat"]  = $Config["fullNameFormat"];
+$users["CURRENT_TAB"] = $ctab;
 
 $oHeadPublisher = & headPublisher::getSingleton();
 $oHeadPublisher->addExtJsScript( 'users/usersGroups', false ); //adding a javascript file .js
diff --git a/workflow/engine/templates/users/usersGroups.js b/workflow/engine/templates/users/usersGroups.js
index 1839b2bdb..b7eb2c6a9 100755
--- a/workflow/engine/templates/users/usersGroups.js
+++ b/workflow/engine/templates/users/usersGroups.js
@@ -263,8 +263,8 @@ Ext.onReady(function(){
   });
 
   //GROUPS DRAG AND DROP PANEL
-  GroupsPanel = new Ext.Panel({ 
-    title     : _('ID_GROUPS'), 
+  GroupsPanel = new Ext.Panel({
+    title: _("ID_GROUPS"),
     autoWidth   : true,
     layout       : 'hbox',
     defaults     : { flex : 1 }, //auto stretch
@@ -408,7 +408,15 @@ Ext.onReady(function(){
         {columnWidth:.6, padding: 3, layout: 'form', items: [userFields]},
         {columnWidth:.4, padding: 3, layout: 'form', items: [userPhoto, caseFields]}
       ]
-    }]
+    }],
+    buttons: [
+        {
+            text: _("ID_EDIT"),
+            handler: function () {
+                location.href = "usersEdit?USR_UID=" + USERS.USR_UID + "&USR_AUTH_SOURCE=" + USERS.USR_AUTH_SOURCE + "&MODE=edit";
+            }
+        }
+    ]
   });
 
   SummaryPanel = new Ext.Panel({