diff --git a/password_policy.module b/password_policy.module
index 11190ac..72811b1 100644
--- a/password_policy.module
+++ b/password_policy.module
@@ -430,11 +430,9 @@ function password_policy_form_alter(&$form, $form_state, $form_id) {
 
       // Password change form.
       $uid = isset($form['#user']->uid) ? $form['#user']->uid : NULL;
-      //if ($uid == 1 && !variable_get('password_policy_admin', 0)) { break; }
       $roles = isset($form['#user']->roles) ? array_keys($form['#user']->roles) : array(DRUPAL_AUTHENTICATED_RID);
-      if($form_id == 'user_register_form') { 
+      if ($form_id == 'user_register_form') { 
         $roles = array(DRUPAL_AUTHENTICATED_RID);
-        unset($form['account']['pass']['#description']);
       }
       $policy = _password_policy_load_active_policy($roles);
 
@@ -448,7 +446,7 @@ function password_policy_form_alter(&$form, $form_state, $form_id) {
       }
 
       // Printing out the restrictions.
-      if (variable_get('password_policy_show_restrictions', 0) && isset($translate)) {
+      if (variable_get('password_policy_show_restrictions', 0) && isset($translate) && (isset($form['pass']) || isset($form['account']['pass']))) {
         $restriction_html = '<div id="account-pass-restrictions">' . theme('item_list', array('items' => $translate, 'title' => t('Password Requirements'))) . '</div>';
         if (isset($form['account']) && is_array($form['account'])) {
           $form['account']['pass']['#prefix'] = $restriction_html;