diff --git a/inactive_user.module b/inactive_user.module
index 9f85f1b..ecdee11 100644
--- a/inactive_user.module
+++ b/inactive_user.module
@@ -13,23 +13,18 @@
  * Implements hook_permission().
  */
 function inactive_user_permission() {
-  return array('change inactive user settings');
-}
-
-/**
- * Implements hook_user_cancel().
- */
-function inactive_user_user_cancel($edit, $account, $method) {
-  db_delete('inactive_users')
-  ->condition('uid', $account->uid)
-  ->execute();
+  return array(
+    'change inactive user settings' => array(
+      'title' => t('Change inactive user settings'), 
+    ),
+  );
 }
 
 /**
  * Implements hook_menu().
  */
 function inactive_user_menu() {
-  $items['admin/user/inactive-user'] = array(
+  $items['admin/people/inactive-user'] = array(
     'title' => 'Inactive users',
     'description' => 'Set rules and contact templates for inactive users.',
     'page callback' => 'drupal_get_form',
@@ -42,6 +37,16 @@ function inactive_user_menu() {
 }
 
 /**
+ * Implements hook_user_cancel().
+ */
+function inactive_user_user_cancel($edit, $account, $method) {
+  db_delete('inactive_users')
+  ->condition('uid', $account->uid)
+  ->execute();
+}
+
+
+/**
  * Custom settings page: menu callback
  *
  * (we're using a custom callback to enable a nicer menu title,
@@ -210,9 +215,10 @@ function inactive_user_custom_settings() {
   );
   return system_settings_form($form);
 }
-
 function inactive_user_custom_settings_validate($form, &$form_state) {
-  $mails = explode(',', $edit['inactive_user_admin_email']);
+  $valid_email = $form_state['values']['inactive_user_admin_email'];
+  $mails = explode(',', $valid_email);
+  $count = 0;
   foreach ($mails as $mail) {
     if ($mail && !valid_email_address(trim($mail))) {
       $invalid[] = $mail;
@@ -441,7 +447,8 @@ function _format_interval($timestamp, $granularity = 2) {
  * Get administrator e-mail address(es)
  */
 function _inactive_user_admin_mail() {
-  $admin_mail = db_result(db_query('SELECT mail FROM {users} WHERE uid = 1'));
+  $uid = 1;
+  $admin_mail = db_query('SELECT mail FROM {users} WHERE uid = :uid', array(':uid' => $uid));
   return variable_get('inactive_user_admin_email', variable_get('site_mail', $admin_mail));
 }