diff --git a/maintenance_helper.drush.inc b/maintenance_helper.drush.inc
old mode 100755
new mode 100644
diff --git a/maintenance_helper.info b/maintenance_helper.info
old mode 100755
new mode 100644
index b98d49d..0507112
--- a/maintenance_helper.info
+++ b/maintenance_helper.info
@@ -1,3 +1,3 @@
-name = "Maintenance Helper"
-description = "Maintenance Helper that assists with performing migrations or other maintenance."
-core = "6.x"
+name = "Maintenance Helper"
+description = "Maintenance Helper that assists with performing migrations or other maintenance."
+core = "7.x"
diff --git a/maintenance_helper.module b/maintenance_helper.module
old mode 100755
new mode 100644
index 11eafa5..4ebf3d7
--- a/maintenance_helper.module
+++ b/maintenance_helper.module
@@ -1,14 +1,14 @@
 <?php
 
 /**
- * Implementation of hook_menu().
+ * Implements hook_menu().
  */
 function maintenance_helper_menu() {
   $items = array();
 
-  $items['admin/settings/maintenance_helper'] = array(
+  $items['admin/config/development/maintenance_helper'] = array(
     'title' => t('Maintenance Helper'),
-    'description' => t('Configure the Maintenance Helper'),
+    'description' => t('Configure the Maintenance Helper.'),
     'page callback' => 'drupal_get_form',
     'page arguments' => array('maintenance_helper_admin_settings'),
     'access arguments' => array('administer site configuration'),
@@ -18,42 +18,44 @@ function maintenance_helper_menu() {
 }
 
 /**
- * Implementation of hook_init().
+ * Implements hook_init().
  */
 function maintenance_helper_init() {
-  if (variable_get('maintenance_helper_message_show', FALSE)) {
-    drupal_set_message(variable_get('maintenance_helper_message', t("This site is currently undergoing maintenance.  You may not be able to post content nor login.  We're working quickly to get the site back online.  Thanks for your patience.")), variable_get('maintenance_helper_message_severity', 'warning'), FALSE);
-  }
-
-  $restrict_logins = variable_get('maintenance_helper_restrict_logins',FALSE);
+  $restrict_logins = variable_get('maintenance_helper_restrict_logins', FALSE);
 
   global $user;
-  if(isset($user->uid) && $user->uid && $restrict_logins && !user_access('login during restricted logins')) {
+  if($user->uid && $restrict_logins && !user_access('login during restricted logins')) {
 
     watchdog('user', 'Session closed for %name.', array('%name' => $user->name));
 
-    // Destroy the current session:
+    // Destroy the current session.
     session_destroy();
     module_invoke_all('user', 'logout', NULL, $user);
 
-    // Load the anonymous user
+    // Load the anonymous user.
     $user = drupal_anonymous_user();
 
-    drupal_set_message(t('Sorry, you do not have the permission to login at this time.'), 'warning');
+    if (variable_get('maintenance_helper_message_show', FALSE)) {
+      drupal_set_message(variable_get('maintenance_helper_message', t("This site is currently undergoing maintenance.  You may not be able to post content nor login.  We're working quickly to get the site back online.  Thanks for your patience.")), variable_get('maintenance_helper_message_severity', 'warning'), FALSE);
+    }
   }
 }
 
 /**
- * Implementation of hook_perm().
+ * Implements hook_permission().
  */
-function maintenance_helper_perm() {
-  return array('login during restricted logins');
+function maintenance_helper_permission() {
+  return array(
+    'login during restricted logins' => array(
+      'title' => 'Bypass restricted login',
+      'description' => 'Log into site even if login is restricted.',
+    ),
+  );
 }
 
 /**
  * Settings page.
  */
-
 function maintenance_helper_admin_settings() {
   // Drupal set message input
   // Whether that should be shown
@@ -94,12 +96,13 @@ function maintenance_helper_admin_settings() {
 }
 
 /**
- * Implementation of hook_form_FORM_ID_alter().
- * Alter the Site Maintenance form.
+ * Implements hook_form_FORM_ID_alter().
+ *
+ * Alters the Maintenance Mode form.
  */
-function maintenance_helper_form_system_site_maintenance_settings_alter(&$form, $form_state) {
-  $form["maintenance_helper_link"] = array(
-    "#value" => "<p>Find more maintenance options in <a href='/admin/settings/maintenance_helper'>Maintenance Helper</a>.</p>",
+function maintenance_helper_form_system_site_maintenance_mode_alter(&$form, $form_state) {
+  $form['maintenance_helper_link'] = array(
+    "#markup" => '<p>' . t('Find more maintenance options in <a href="@url">Maintenance Helper</a>.', array('@url' => url('admin/config/development/maintenance_helper'))) . '</p>',
     "#weight" => 0,
   );
 }