diff --git a/sites/all/modules/blizzardapi/modules/blizzardapi_login/blizzardapi_login.module b/sites/all/modules/blizzardapi/modules/blizzardapi_login/blizzardapi_login.module
index 496db1a..b49ad4b 100644
--- a/sites/all/modules/blizzardapi/modules/blizzardapi_login/blizzardapi_login.module
+++ b/sites/all/modules/blizzardapi/modules/blizzardapi_login/blizzardapi_login.module
@@ -351,10 +351,16 @@ function blizzardapi_login_form_user_login_alter(&$form, &$form_state) {
     '#default_value' => BlizzardApiLoginClient::REGION_US,
     '#required' => TRUE
   );
+  if (module_exists('persistent_login')) {
+    $form['blizzardapi_login']['persistent_login'] = array(
+      '#type' => 'checkbox',
+      '#title' => t('Remember me'),
+    );
+  }
   $form['blizzardapi_login']['battlenet_login'] = array(
     '#type' => 'submit',
     '#value' => t('Log in with Battle.net'),
-    '#limit_validation_errors' => array(array('battlenet_region')),
+    '#limit_validation_errors' => array(array('battlenet_region'), array('persistent_login')),
     '#validate' => array('blizzardapi_login_user_login_validate'),
     '#submit' => array('blizzardapi_login_user_login_submit')
   );
@@ -611,6 +617,13 @@ function blizzardapi_login_user_login_block() {
     ),
     '#default_value' => BlizzardApiLoginClient::REGION_US
   );
+
+  if (module_exists('persistent_login')) {
+    $form['persistent_login'] = array(
+      '#type' => 'checkbox',
+      '#title' => t('Remember me'),
+    );
+  }
   $form['actions'] = array('#type' => 'actions');
   $form['actions']['battlenet_login'] = array(
     '#type' => 'submit',
@@ -657,6 +670,8 @@ function blizzardapi_login_user_login_submit($form, &$form_state) {
   if (isset($_GET['destination'])) {
     unset($_GET['destination']);
   }
+
+  $_SESSION['blizzardapi_login']['form_values'] = $form_state['values'];
   
   drupal_goto($client->getAuthorizeUrl($token));
 }
diff --git a/sites/all/modules/blizzardapi/modules/blizzardapi_login/includes/blizzardapi_login.pages.inc b/sites/all/modules/blizzardapi/modules/blizzardapi_login/includes/blizzardapi_login.pages.inc
index 6f16e93..122cd9b 100644
--- a/sites/all/modules/blizzardapi/modules/blizzardapi_login/includes/blizzardapi_login.pages.inc
+++ b/sites/all/modules/blizzardapi/modules/blizzardapi_login/includes/blizzardapi_login.pages.inc
@@ -120,6 +120,8 @@ function blizzardapi_login_complete($account_id, $token, $destination = '') {
       
       // Login.
       if (!form_get_errors()) {
+        $login_state = array();
+        $login_state['values'] = $_SESSION['blizzardapi_login']['form_values'] ?: array();
         $login_state['uid'] = $account->uid;
         user_login_submit(array(), $login_state);
         module_invoke_all('blizzardapi_login_success', $account, $region);