diff --git a/actions/administrator/user/edit.php b/actions/administrator/user/edit.php
index bc3ef6632..6399c1de4 100644
--- a/actions/administrator/user/edit.php
+++ b/actions/administrator/user/edit.php
@@ -61,7 +61,7 @@
 $user->new_type   = $vars['type'];
 
 //check if email is not in user
-if($entity->email !== input('email')) {
+if($user->email !== input('email')) {
 		$OssnUser        = new OssnUser();
 		$OssnUser->email = $vars['email'];
 
@@ -69,11 +69,11 @@
 				ossn_trigger_message(ossn_print('email:inuse'), 'error');
 				redirect(REF);
 		}
-}
-//check if email is valid email
-if(!$OssnUser->isEmail()) {
-		ossn_trigger_message(ossn_print('email:invalid'), 'error');
-		redirect(REF);
+		//check if email is valid email
+		if(!$OssnUser->isEmail()) {
+				ossn_trigger_message(ossn_print('email:invalid'), 'error');
+				redirect(REF);
+		}
 }
 //check if password then change password
 if(!empty($password)) {
@@ -98,4 +98,4 @@
 		ossn_trigger_message(ossn_print('user:updated'), 'success');
 		redirect(REF);
 }
-redirect(REF);
\ No newline at end of file
+redirect(REF);