diff --git a/amazon_like_login.module b/amazon_like_login.module
index d4cc984..46845d5 100644
--- a/amazon_like_login.module
+++ b/amazon_like_login.module
@@ -219,7 +219,7 @@ function amazon_like_login_form_user_login_validate($form, &$form_state) {
   // error. If not, redirect the user to 'user/register' page.
   if ($form_state['values']['password_fieldset'] == 0) {
     if (!empty($form_state['values']['email'])) {
-      $username = check_plain($form_state['values']['email']);
+      $username = $form_state['values']['email'];
       $count = db_select('users', 'u')
         ->condition('u.mail', $username)
         ->fields('u', array('uid'))
@@ -239,7 +239,7 @@ function amazon_like_login_form_user_login_validate($form, &$form_state) {
     // check whether a user with the same username exists. If it exists, give an
     // error. If not, redirect the user to 'user/register' page.
     else {
-      $user_name = check_plain($form_state['values']['name']);
+      $user_name = $form_state['values']['name'];
 
       $check_existing_user_name = db_select('users', 'u')
         ->condition('u.name', $user_name)
@@ -274,34 +274,6 @@ function amazon_like_login_form_user_pass_alter(&$form, &$form_state) {
 }
 
 /**
- * Implements hook_form_FORM_ID_alter() for user_profile_form().
- *
- * Adds a validation function.
- */
-function amazon_like_login_form_user_profile_form_alter(&$form, &$form_state) {
-  global $user;
-  if ($user->uid != 1) {
-    array_unshift($form['#validate'], 'amazon_like_login_form_user_profile_form_validate');
-    $form['account']['name']['#access'] = FALSE;
-  }
-}
-
-/**
- * Copies email id to the username field.
- *
- * @param array $form
- *   Form to validate. In this case, user_prfile_form().
- * @param array $form_state
- *   Reference to form state.
- */
-function amazon_like_login_form_user_profile_form_validate($form, &$form_state) {
-  global $user;
-  if ($user->uid != 1) {
-    $form_state['values']['name'] = $form_state['values']['mail'];
-  }
-}
-
-/**
  * Implements hook_form_FORM_ID_alter() for user_login_block().
  *
  * Replaces the label username by e-mail address.