diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php
index 6ce443ddc..0a93c05a5 100644
--- a/modules/member/member.controller.php
+++ b/modules/member/member.controller.php
@@ -31,6 +31,7 @@
             if(!$password) return new Object(-1,'null_password');
 
             $output = $this->doLogin($user_id, $password, $keep_signed=='Y'?true:false);
+	    if (!$output->toBool()) return $output;
 
             $oModuleModel = &getModel('module');
             $config = $oModuleModel->getModuleConfig('member');
@@ -48,11 +49,11 @@
                 }
             }
 
-			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
-				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', '');
-				$this->setRedirectUrl($returnUrl);
-				return;
-			}
+	    if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+		    $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', '');
+		    $this->setRedirectUrl($returnUrl);
+		    return;
+	    }
 
             return $output;
         }
@@ -1437,20 +1438,20 @@
             // Create a member model object
             $oMemberModel = &getModel('member');
 
-			// check identifier
-			$config = $oMemberModel->getMemberConfig();
-			if ($config->identifier == 'email_address'){
-				// Get user_id information
-				$this->memberInfo = $oMemberModel->getMemberInfoByEmailAddress($user_id);
-				// Set an invalid user if no value returned
-				if(!$user_id || strtolower($this->memberInfo->email_address) != strtolower($user_id)) return new Object(-1, 'invalid_email_address');
+	    // check identifier
+	    $config = $oMemberModel->getMemberConfig();
+	    if ($config->identifier == 'email_address'){
+		    // Get user_id information
+		    $this->memberInfo = $oMemberModel->getMemberInfoByEmailAddress($user_id);
+		    // Set an invalid user if no value returned
+		    if(!$user_id || strtolower($this->memberInfo->email_address) != strtolower($user_id)) return new Object(-1, 'invalid_email_address');
 
-			}else{
-				// Get user_id information
-				$this->memberInfo = $oMemberModel->getMemberInfoByUserID($user_id);
-				// Set an invalid user if no value returned
-				if(!$user_id || strtolower($this->memberInfo->user_id) != strtolower($user_id)) return new Object(-1, 'invalid_user_id');
-			}
+	    }else{
+		    // Get user_id information
+		    $this->memberInfo = $oMemberModel->getMemberInfoByUserID($user_id);
+		    // Set an invalid user if no value returned
+		    if(!$user_id || strtolower($this->memberInfo->user_id) != strtolower($user_id)) return new Object(-1, 'invalid_user_id');
+	    }
             // Password Check
             if($password && !$oMemberModel->isValidPassword($this->memberInfo->password, $password)) return new Object(-1, 'invalid_password');
             // If denied == 'Y', notify