diff --git a/css/two_factor_authentication.css b/css/two_factor_authentication.css
index 6a2df88..59c7366 100644
--- a/css/two_factor_authentication.css
+++ b/css/two_factor_authentication.css
@@ -152,7 +152,7 @@ html.js #user-login li.tfa-link {
 .device-support {
   float: right;
 }
-#two-factor-authentication-form .form-submit, .page-admin-config ul.tabs.secondary {
+#two-factor-authentication-form .form-submit, .page-admin-config ul.tabs.secondary, #google-authenticator #edit-next {
   display: none;
 }
 select[id*='edit-country-code'] option[value="in"] {
@@ -860,7 +860,7 @@ button.close {
 }
 
 #google-authenticator .ga_auth_hr {
-  border-bottom: 1px solid gray;
+  border-bottom: 1px solid #EBECEC;
   padding-bottom: 10px;
 }
 
@@ -874,13 +874,14 @@ button.close {
   padding: 5px 5px;
 }
 
-#google-authenticator .step-2 ol {
-  padding-bottom: 10px;
+#google-authenticator .step-2 {
+  border-right: 1px solid #EBECEC;
+  border-left: 1px solid #EBECEC;
+  padding: 0 20px;
 }
 
-#google-authenticator .step-1, #google-authenticator .step-2 {
-  border-right: 1px solid gray;
-  padding-right: 20px;
+#google-authenticator .step-2 ol {
+  padding-bottom: 10px;
 }
 
 #edit-support .form-item-country-code {
diff --git a/google_auth_setup.inc b/google_auth_setup.inc
index f23c06d..b9e25d0 100644
--- a/google_auth_setup.inc
+++ b/google_auth_setup.inc
@@ -44,6 +44,9 @@ function google_authenticator($form, &$form_state) {
     '#value' => 'Next >>',
   );
 
+  $form['back']['#type'] = 'submit';
+  $form['back']['#value'] = t('Back');
+
   return $form;
 }
 
@@ -69,9 +72,12 @@ function ga_setup_page(&$form_state) {
   $form['next'] = array(
     '#type' => 'submit',
     '#value' => 'Next >>',
-    '#suffix' => '</div>',
   );
 
+  $form['back']['#type'] = 'submit';
+  $form['back']['#value'] = t('Back');
+  $form['back']['#suffix'] = '</div>';
+
   $mo2f_google_auth = isset($_SESSION['mo2f_google_auth']) ? $_SESSION['mo2f_google_auth'] : NULL;
   $data = isset($_SESSION['mo2f_google_auth']) ? $mo2f_google_auth['ga_qrCode'] : NULL;
   $ga_secret = isset($_SESSION['mo2f_google_auth']) ? $mo2f_google_auth['ga_secret'] : NULL;
@@ -161,8 +167,7 @@ function ga_setup_page(&$form_state) {
       '#collapsed' => TRUE,
     );
     $scan = '';
-    $scan .= '<div>Can\'t scan the barcode?</div>
-            <ol>
+    $scan .= '<ol>
             <li>In Google Authenticator, tap +.</li>
             <li>Key type: make sure "Time-based" is selected.</li>
             <li>In "Account" type your full email address.</li>
@@ -201,6 +206,10 @@ function ga_setup_page(&$form_state) {
  * Form submit handler for google auth form.
  */
 function google_authenticator_submit($form, &$form_state) {
+  if (!empty($form_state['triggering_element']) && $form_state['triggering_element']['#parents'][0] == 'back') {
+    drupal_goto('admin/config/mo2f/mo2f_tfa/setup-two-factor');
+    exit;
+  }
 
   global $user;
   $user = user_load($user->uid);
diff --git a/js/two_factor_authentication.js b/js/two_factor_authentication.js
index 19c540b..39556b0 100644
--- a/js/two_factor_authentication.js
+++ b/js/two_factor_authentication.js
@@ -33,11 +33,13 @@
             );
 
             // On selection of auth type submits the form.
-            $("#two-factor-authentication-form input[type='radio']").click(
-                function(){
-                    $("#two-factor-authentication-form").submit();
-                }
-            );
+            $("#two-factor-authentication-form input[type='radio']").click(function(){
+              $("#two-factor-authentication-form").submit();
+            });
+            // On selection of phone type submits the form
+            $("#google-authenticator input[type='radio']").click(function(){
+              $("#google-authenticator").submit();
+            });
 
             // Phone country code.
             $("#edit-country-code option").filter(