diff --git a/modules/user/user.admin.inc b/modules/user/user.admin.inc
index eac39df..1c86641 100644
--- a/modules/user/user.admin.inc
+++ b/modules/user/user.admin.inc
@@ -224,10 +224,15 @@ function user_admin_account_submit($form, &$form_state) {
 }
 
 function user_admin_account_validate($form, &$form_state) {
+   global $user;
+
   $form_state['values']['accounts'] = array_filter($form_state['values']['accounts']);
   if (count($form_state['values']['accounts']) == 0) {
     form_set_error('', t('No users selected.'));
   }
+  elseif($form_state['values']['operation']=="block" && in_array($user->uid, $form_state['values']['accounts'])){
+    form_set_error('', t('You cannot block your own user.'));
+  }
 }
 
 /**
diff --git a/modules/user/user.pages.inc b/modules/user/user.pages.inc
index 3a52a01..41cb0b9 100644
--- a/modules/user/user.pages.inc
+++ b/modules/user/user.pages.inc
@@ -247,10 +247,18 @@ function user_edit($account, $category = 'account') {
  * @see user_edit_delete_submit()
  */
 function user_profile_form($form_state, $account, $category = 'account') {
-
+  global $user;
+  
+    
   $edit = (empty($form_state['values'])) ? (array)$account : $form_state['values'];
 
   $form = _user_forms($edit, $account, $category);
+  // If user is the same user logged don't allow blocking
+  
+  if($user->uid == $account->uid){
+      unset($form['account']['status']);
+  }
+  
   $form['_category'] = array('#type' => 'value', '#value' => $category);
   $form['_account'] = array('#type' => 'value', '#value' => $account);
   $form['submit'] = array('#type' => 'submit', '#value' => t('Save'), '#weight' => 30);
@@ -347,6 +355,7 @@ function user_edit_validate($form, &$form_state) {
     // set this to a value type field
     form_set_error('category', t('Detected malicious attempt to alter protected user fields.'));
   }
+  
 }
 
 function user_edit_submit($form, &$form_state) {