diff --git a/sites/all/modules/contrib/admin/simple_pass_reset/LICENSE.txt b/sites/all/modules/contrib/admin/simple_pass_reset/LICENSE.txt
new file mode 100644
index 00000000..d159169d
--- /dev/null
+++ b/sites/all/modules/contrib/admin/simple_pass_reset/LICENSE.txt
@@ -0,0 +1,339 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff --git a/sites/all/modules/contrib/admin/simple_pass_reset/README.txt b/sites/all/modules/contrib/admin/simple_pass_reset/README.txt
new file mode 100644
index 00000000..3ed8c4d0
--- /dev/null
+++ b/sites/all/modules/contrib/admin/simple_pass_reset/README.txt
@@ -0,0 +1,28 @@
+Simple Password Reset is a module for Drupal 7.x which changes the user experience when resetting their password.  Also setting the password the first time.
+
+Without this module, Drupal emails the user a link to a "one-time login" page.  On that page, they click "Log in" and on the next page they may edit their password.
+
+With this module, Drupal emails a link and on that page the user may edit his/her password.  That is, the "one-time login" page is skipped entirely.
+
+This is useful because it streamlines the process.  Also, many users find the one-time login page confusing and unexpected.  So not needing that is a good thing.
+
+The idea for this module comes from Dave Cohen, and is described in detail in his blog at http://www.dave-cohen.com/node/1000030.
+
+* Installation
+
+Enable the module as you would any other Drupal 7.x module.
+
+On install, this module will adjust its own weight to 1 (instead of 0).  This is so our form_alter hooks act after system.module's.  If for any reason your system.module (or, any module that alters the password form) has a weight higher than 0, you may want to manually change the weight of this module to be even higher.
+
+Recommended: Under Administration >> Configuration >> People >> Settings >> Password recovery, change the link emailed to the user to the following:
+
+  [user:one-time-login-url]/brief
+
+By appending "/brief" the user is shown a minimal form to change the password, instead of the default profile edit form.
+
+
+* Issue Queue
+
+Please report problems, suggest improvements, etc on the project issue queue: https://drupal.org/project/issues/simple_pass_reset
+
+When submitting issues, a proper issue begins with the sentence "I read the README.txt."
diff --git a/sites/all/modules/contrib/admin/simple_pass_reset/simple_pass_reset.info b/sites/all/modules/contrib/admin/simple_pass_reset/simple_pass_reset.info
new file mode 100644
index 00000000..ca6c4b30
--- /dev/null
+++ b/sites/all/modules/contrib/admin/simple_pass_reset/simple_pass_reset.info
@@ -0,0 +1,11 @@
+name = Simple Password Reset
+description = When resetting a password, skip the unnecessary and confusing one-time login form.
+core = 7.x
+files[] = simple_pass_reset.module
+
+; Information added by Drupal.org packaging script on 2015-04-10
+version = "7.x-1.5"
+core = "7.x"
+project = "simple_pass_reset"
+datestamp = "1428699782"
+
diff --git a/sites/all/modules/contrib/admin/simple_pass_reset/simple_pass_reset.install b/sites/all/modules/contrib/admin/simple_pass_reset/simple_pass_reset.install
new file mode 100644
index 00000000..ad93369a
--- /dev/null
+++ b/sites/all/modules/contrib/admin/simple_pass_reset/simple_pass_reset.install
@@ -0,0 +1,25 @@
+<?php
+/**
+ * @file
+ * Drupal install and update hooks.
+ */
+
+/**
+ * On install, make our module's weight higher than system.module.
+ */
+function simple_pass_reset_install() {
+  db_update('system')
+    ->fields(array('weight' => 1))
+    ->condition('name', 'simple_pass_reset', '=')
+    ->execute();
+}
+
+/**
+ * Update our module's weight higher than system.module.
+ */
+function simple_pass_reset_update_7100() {
+  db_update('system')
+    ->fields(array('weight' => 1))
+    ->condition('name', 'simple_pass_reset', '=')
+    ->execute();
+}
diff --git a/sites/all/modules/contrib/admin/simple_pass_reset/simple_pass_reset.module b/sites/all/modules/contrib/admin/simple_pass_reset/simple_pass_reset.module
new file mode 100644
index 00000000..bcbab266
--- /dev/null
+++ b/sites/all/modules/contrib/admin/simple_pass_reset/simple_pass_reset.module
@@ -0,0 +1,229 @@
+<?php
+
+/**
+ * Implements hook_menu_alter().
+ */
+function simple_pass_reset_menu_alter(&$items) {
+  // Drupal's default behavior is to show the user a log-in form before
+  // their user profile.  We replace this item to skip the uneccesary step.
+  $items['user/reset/%/%/%'] = array(
+    'title' => 'Account settings',
+    'access callback' => 'simple_pass_reset_pass_reset_access',
+    'access arguments' => array(2, 3, 4),
+    'page callback' => 'simple_pass_reset_pass_reset_page',
+    'page arguments' => array(2, 3, 4),
+    'type' => MENU_CALLBACK,
+  );
+}
+
+/**
+ * Access callback for use with Drupal's menu API.
+ */
+function simple_pass_reset_pass_reset_access($uid, $timestamp, $hashed_pass) {
+  if (user_is_logged_in()) {
+    return FALSE;
+  }
+
+  // This timeout check imitates core logic in user_pass_reset(). The timeout
+  // number is expressed in seconds, with 86400 equal to one day. There is no
+  // UI to adjust this number, but sites can customize it in their settings.php.
+  $timeout = variable_get('user_password_reset_timeout', 86400);
+
+  // Ensure the user is not blocked.
+  $users = user_load_multiple(array($uid), array('status' => '1'));
+
+  if ($timestamp <= REQUEST_TIME && $account = reset($users)) {
+    // Bypass the timeout check if the user has not logged in before.
+    if ($account->login && REQUEST_TIME - $timestamp > $timeout) {
+      drupal_set_message(t('You have tried to use a one-time login link that has expired. Please request a new one using the form below.'), 'status', FALSE);
+      drupal_goto('user/password');
+    }
+    elseif ($account->uid && $timestamp >= $account->login && $timestamp <= REQUEST_TIME && $hashed_pass == user_pass_rehash($account->pass, $timestamp, $account->login, $account->uid)) {
+      return TRUE;
+    }
+  }
+
+  return FALSE;
+}
+
+/**
+ * Page callback for use with Drupal's menu API.
+ *
+ * This page replaces core one-time login form provided by user_pass_reset().
+ */
+function simple_pass_reset_pass_reset_page($uid, $timestamp, $hashed_pass, $option = NULL) {
+  // Never cache this page.
+  drupal_page_is_cacheable(FALSE);
+
+  module_load_include('inc', 'user', 'user.pages');
+
+  // When $option is original or login, preserve original behavior.
+  if ($option == 'original') {
+    return drupal_get_form('user_pass_reset', $uid, $timestamp, $hashed_pass);
+  }
+  elseif ($option == 'login') {
+    return drupal_get_form('user_pass_reset', $uid, $timestamp, $hashed_pass, $option);
+  }
+  else {
+    // Show the user edit form instead of silly one-time login form.
+    $account = user_load($uid);
+    $form = drupal_get_form('user_profile_form', $account);
+    return $form;
+  }
+}
+
+/**
+ * Implements hook_form_FORM_ID_alter().
+ *
+ * @see user_profile_form()
+ */
+function simple_pass_reset_form_user_profile_form_alter(&$form, &$form_state) {
+  // Don't alter the normal profile edit form, but only the password reset form.
+  if (arg(0) == 'user' && arg(1) == 'reset' && !user_is_logged_in()) {
+    // Our submit handler will log the user in after form submit.
+    $form['#submit'][] = 'simple_pass_reset_pass_reset_submit';
+
+    $form['actions']['submit']['#value'] = t('Save and log in as !username', array('!username' => format_username($form['#user'])));
+
+    // Links provided by the Bakery module will not work because the user is not
+    // logged in yet.
+    if (!empty($form['bakery'])) {
+      $form['bakery']['#access'] = FALSE;
+
+      // Normally the Bakery module would make the following change to the
+      // user_pass_reset form.
+      if (!variable_get('bakery_is_master', FALSE)) {
+        // Set a submit handler for the pseudo-reset form.
+        $form['#submit'] = array('_bakery_reset_submit');
+      }
+    }
+
+    // Some third-party modules (like Bakery) might hide account elements.
+    if (!isset($form['account']['#access']) || $form['account']['#access']) {
+      // Require a new password.
+      $form['account']['pass']['#required'] = TRUE;
+
+      if (arg(5) == 'brief') {
+        drupal_set_title(t('Choose a new password')); // Instead of "Reset password".
+
+        // Hide "To change the current user password..."
+        unset($form['account']['pass']['#description']);
+
+        // The user is most interested in getting a working password, don't show their picture, timezone, etc.
+        foreach (element_children($form) as $key) {
+          if (isset($form[$key]['#type']) && in_array($form[$key]['#type'], array('hidden', 'actions', 'captcha'))) {
+            // Do not alter these elements.
+          }
+          else {
+            // Hide other elements.
+            $form[$key]['#access'] = FALSE;
+          }
+        }
+        // Except don't hide these.
+        $form['account']['#access'] = TRUE;
+        $form['actions']['#access'] = TRUE;
+
+        // But seriously do hide these.
+        $form['account']['mail']['#access'] = FALSE;
+      }
+    }
+
+    // This is to avoid a PHP Notice in user_profile_form_submit().  https://www.drupal.org/node/2111293#comment-9262499
+    if (empty($_SESSION)) {
+      $_SESSION = array('simple_pass_reset' => TRUE);
+    }
+  }
+}
+
+/**
+ * Submit callback for Drupal form API.
+ */
+function simple_pass_reset_pass_reset_submit($form, &$form_state) {
+  if (!user_is_logged_in()) { // Sanity check.
+    // Remove roles that were disabled in the form. Normally the User module
+    // will array_filter() these out for us.  But remember_me and possibly other
+    // modules have bugs that might prevent it from doing so.
+    if (!empty($form_state['user']->roles)) {
+      $form_state['user']->roles = array_filter($form_state['user']->roles);
+    }
+
+    // Load the user account afresh and finalize the login.
+    // @see user_login_submit()
+    global $user;
+    $user = user_load($form_state['user']->uid);
+    user_login_finalize();
+
+    watchdog('user', 'User %name used one-time login link.', array('%name' => $user->name));
+
+    if(empty($form_state['redirect'])) {
+      $form_state['redirect'] = 'user';
+    }
+  }
+}
+
+/**
+ * Implements hook_module_implements_alter().
+ *
+ * Asks Drupal to run our form_alter hooks after other modules.
+ */
+function simple_pass_reset_module_implements_alter(&$implementations, $hook) {
+  // The hook we're interested in is hook_form_FORM_ID_alter().  Yet, in this function we have to manipulate 'form_alter'.  Because Drupal is tricky like that.
+  if ($hook == 'form_alter' && isset($implementations['simple_pass_reset'])) {
+    // Make our form alters come last (so we act after other modules have already altered).
+    $group = $implementations['simple_pass_reset'];
+    unset($implementations['simple_pass_reset']);
+    $implementations['simple_pass_reset'] = $group;
+  }
+}
+
+
+/**
+ * Implements hook_form_FORM_ID_alter().
+ *
+ * This is not about simplifying the text on the password reset form, but it's
+ * behavior.  If a logged in user resets her password, she's sent a link via
+ * email.  But will get access denied clicking that link, because she's already
+ * logged in!  This hook will log her out when resetting password.  This makes
+ * the password reset form behave more like the user edit form when a user
+ * changes their own password. (See where user_save() calls
+ * drupal_session_destroy_uid().)
+ */
+function simple_pass_reset_form_user_pass_alter(&$form, &$form_state) {
+  // If the user views the password reset form while logged in...
+  if (user_is_logged_in()) {
+    drupal_set_title(t('Reset my password'));
+
+    // Update the help text and button text to indicate that submitting the form
+    // will log them out.
+    $form['mail']['#markup'] = t('We will e-mail a password reset link for your account to %email. You will be logged out when you submit this form and should use that link to log back in.', array('%email' => $form['name']['#value']));
+    $form['actions']['submit']['#value'] = t('E-mail reset link and log out');
+
+    // Add a form submit handler to log out upon submission.
+    $form['#submit'][] = 'simple_pass_reset_form_user_pass_submit';
+  }
+}
+
+/**
+ * Submit callback: log out when an authenticated user submits the password
+ * reset form.
+ */
+function simple_pass_reset_form_user_pass_submit($form, &$form_state) {
+  global $user;
+
+  if (user_is_logged_in()) {
+    drupal_session_destroy_uid($user->uid);
+
+    // Some code copied from user_logout(), which we cannot call here because it
+    // uses drupal_goto().
+    watchdog('user', 'Session closed for %name.', array('%name' => $user->name));
+
+    module_invoke_all('user_logout', $user);
+
+    // Destroy the current session, and reset $user to the anonymous user.
+    session_destroy();
+
+    // Note call drupal_set_message() AFTER session_destroy().
+    drupal_set_message(t('The password reset link has been sent to your e-mail address. You are now logged out.'));
+    $form_state['redirect'] = '<front>';
+  }
+}