diff --git a/password_policy.module b/password_policy.module
index 7ae3fac..09119a4 100644
--- a/password_policy.module
+++ b/password_policy.module
@@ -61,7 +61,7 @@ function password_policy_permission() {
 }
 
 /**
- * Implements hook_theme(). 
+ * Implements hook_theme().
  */
 function password_policy_theme() {
   return array(
@@ -153,6 +153,7 @@ function password_policy_menu() {
     'page callback' => 'password_policy_expired_list',
     'page arguments' => array('password_policy_list_expired'),
     'access arguments' => array('unblock expired accounts'),
+    'file' => 'password_policy.admin.inc',
   );
   $items['admin/people/expired/unblock/%pp_uid'] = array(
     'title' => 'Unblock',
@@ -236,7 +237,7 @@ function password_policy_user_load($users) {
       ->condition('uid', $user->uid)
       ->execute()
       ->fetchField();
-      
+
    if(empty($user->force_password_change)) {
      $blocked = db_select('password_policy_expiration', 'p', array('target' => 'slave'))
       ->fields('p', array(
@@ -244,13 +245,13 @@ function password_policy_user_load($users) {
       ))
       ->condition('uid', $user->uid)
       ->execute()
-      ->fetchField(); 
+      ->fetchField();
      if(!empty($blocked)) {
       if($blocked < time()) {
         $user->force_password_change = 1;
       }
-     }  
-   }      
+     }
+   }
   }
 }
 
@@ -293,7 +294,7 @@ function password_policy_user_update(&$edit, $account, $category) {
       ->execute();
     db_delete('password_policy_expiration')
       ->condition('uid', $account->uid)
-      ->execute();     
+      ->execute();
   }
   elseif (!empty($edit['force_password_change'])) {
     // Check if user already has a force change entry
@@ -397,7 +398,7 @@ function password_policy_user_login(&$edit, $account) {
 
 function password_policy_user_delete($account) {
   $txn = db_transaction();
-  
+
   // ensure all deletes occur
   try {
     db_delete('password_policy_history')
@@ -451,7 +452,7 @@ function password_policy_form_alter(&$form, $form_state, $form_id) {
       // Password change form.
       $account = $form['#user'];
       $roles = isset($account->roles) ? array_keys($account->roles) : array(DRUPAL_AUTHENTICATED_RID);
-      if ($form_id == 'user_register_form') { 
+      if ($form_id == 'user_register_form') {
         $roles = array(DRUPAL_AUTHENTICATED_RID);
       }
       $policy = _password_policy_load_active_policy($roles);
@@ -649,7 +650,7 @@ function password_policy_password_validate($form, &$form_state) {
 
   $values = $form_state['values'];
   $account = isset($form['#user']) ? $form['#user'] : (object)array('uid' => 0);
-  if($account->uid == 0) { 
+  if($account->uid == 0) {
     $account->roles = array(DRUPAL_AUTHENTICATED_RID => DRUPAL_AUTHENTICATED_RID);
   }
   if (isset($values['name'])) {
@@ -957,21 +958,21 @@ function _password_policy_load_active_policy($roles) {
   if (empty($roles)) {
     $roles = array(DRUPAL_ANONYMOUS_RID);
   }
-  
+
   // If the role is a name, not an ID, replace with the ID
   for ($i=0;$i<sizeof($roles);$i++) {
     if(!is_numeric($roles[$i])) {
       $query = db_select('role', 'r', array('fetch' => PDO::FETCH_ASSOC, 'target' => 'slave'));
-      $row = $query->fields('p.rid')      
+      $row = $query->fields('p.rid')
             ->condition('r.name', $roles[$i])
             ->execute()
-            ->fetchAssoc();     
+            ->fetchAssoc();
       if (!empty($row['rid'])) {
         $roles[$i] = $row['rid'];
-      }       
+      }
     }
   }
-  
+
   $key = implode(',', $roles);
   // Use array_key_exists() instead of isset() as NULLs may be in the array.
   if (!array_key_exists($key, $cache)) {
@@ -1080,7 +1081,7 @@ function _password_policy_unblock($account) {
         'unblocked' => time(),
       ))
       ->condition('uid', $account->uid)
-      ->execute();  
+      ->execute();
     user_save($account, array('status' => 1));
     drupal_set_message(t('The user %name has been unblocked.', array('%name' => $account->name)));
   }