--- securepages.module.bak	2012-05-11 13:01:28.087629910 +0200
+++ securepages.module	2012-05-11 14:54:42.219387048 +0200
@@ -74,6 +74,14 @@
     return;
   }
 
+  // If the user/login block matches, secure the login block.
+  if (securepages_match('user/login') && $form_id == 'user_login_block') {
+    if (!$is_https) {
+      $form['#https'] = TRUE;
+    }
+    return;
+  }
+
   if (isset($form['#action']) && securepages_can_alter_url($form['#action'])) {
     // Remove the base_path, and extract the path component.
     $url = substr($form['#action'], strlen(base_path()));
@@ -92,16 +100,6 @@
     if ($page_match && !$is_https) {
       $form['#https'] = TRUE;
     }
-    elseif ($page_match === 0 && $is_https && variable_get('securepages_switch', FALSE)) {
-      $url['https'] = FALSE;
-      $url['absolute'] = TRUE;
-      $form['#action'] = url($url['path'], $url);
-    }
-  }
-
-  // If the user/login block matches, also secure the login block.
-  if (securepages_match('user/login') && $form_id == 'user_login_block' && !$is_https) {
-    $form['#https'] = TRUE;
   }
 }