Index: securepages.module
===================================================================
--- securepages.module	(revision 2099)
+++ securepages.module	(working copy)
@@ -110,7 +110,7 @@
     $path = drupal_get_normal_path($path);
     $query = drupal_query_string_encode($query);
     $page_match = securepages_match($path);
-    if ($page_match && !securepages_is_secure()) {
+    if (($page_match || $form_id == 'user_login_block' || $form_id == 'user_login' || $form_id == 'user_pass_reset') && !securepages_is_secure()) {
       $form['#action'] = securepages_url($path, array('query' => $query, 'secure' => TRUE));
     }
     elseif ($page_match === 0 && securepages_is_secure() && variable_get('securepages_switch', FALSE)) {
@@ -120,6 +120,21 @@
 }
 
 /**
+ * Implementation of hook_user()
+ */
+function securepages_user($type, &$edit, &$user, $category = NULL) {
+  if (!variable_get('securepages_enable', 0)) {
+    return;
+  }
+  switch ($type) {
+  case 'logout':
+    global $base_url;
+    $base_url = securepages_baseurl(FALSE);
+    break;
+   }
+ }
+
+/**
  * Implementation of hook_link_alter().
  */
 function securepages_link_alter(&$links, &$node) {
@@ -473,4 +488,4 @@
   }
   
   return TRUE;
-}
\ No newline at end of file
+}