diff --git a/workflow/engine/classes/model/Users.php b/workflow/engine/classes/model/Users.php
index 7f9e3a6e1..1e573390c 100755
--- a/workflow/engine/classes/model/Users.php
+++ b/workflow/engine/classes/model/Users.php
@@ -228,13 +228,11 @@ public function userExists($UsrUid)
   }
 
   function loadByUsernameInArray($sUsername){
-    echo $sUsername;
     $c  = $this->loadByUsername($sUsername);
     $rs = UsersPeer::doSelectRS($c);
     $rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
     $rs->next();
     $row = $rs->getRow();
-    print_r($row);
     return $row;
   }
 
diff --git a/workflow/engine/methods/login/authentication.php b/workflow/engine/methods/login/authentication.php
index d4f4a28d9..21756666a 100755
--- a/workflow/engine/methods/login/authentication.php
+++ b/workflow/engine/methods/login/authentication.php
@@ -60,12 +60,15 @@ try {
             //The user is inactive
             case -3:
                 require_once 'classes/model/Users.php';
-                $user = new Users;
+                $user = new Users();
                 $aUser = $user->loadByUsernameInArray($usr);
 
                 switch ($aUser['USR_STATUS']) {
                     case 'VACATION':
-                        $errLabel = 'ID_USER_ONVACATION';
+                        $uid = $aUser['USR_UID'];
+                        $RBAC->changeUserStatus($uid, 1);
+                        $aUser['USR_STATUS'] = 'ACTIVE';
+                        $user->update($aUser);
                         break;
                     case 'INACTIVE':
                         $errLabel = 'ID_USER_INACTIVE';
diff --git a/workflow/engine/methods/users/users_Ajax.php b/workflow/engine/methods/users/users_Ajax.php
index d70d3e7af..5d7affa5d 100755
--- a/workflow/engine/methods/users/users_Ajax.php
+++ b/workflow/engine/methods/users/users_Ajax.php
@@ -214,7 +214,7 @@ try {
     case 'changeUserStatus':
        $response = new stdclass();
        if (isset($_REQUEST['USR_UID']) && isset($_REQUEST['NEW_USR_STATUS'])) {
-         $RBAC->changeUserStatus($_REQUEST['USR_UID'], $_REQUEST['NEW_USR_STATUS']);
+         $RBAC->changeUserStatus($_REQUEST['USR_UID'], ($_REQUEST['NEW_USR_STATUS'] == 'ACTIVE' ? 1 : 0));
          require_once 'classes/model/Users.php';
          $userInstance = new Users();
          $userData = $userInstance->load($_REQUEST['USR_UID']);