diff --git a/commerce_yotpo.admin.inc b/commerce_yotpo.admin.inc
index d9e8bbf..1e0f377 100644
--- a/commerce_yotpo.admin.inc
+++ b/commerce_yotpo.admin.inc
@@ -6,6 +6,18 @@
  */
 
 /**
+ * Menu callback. Redirect the user to the right page.
+ */
+function commerce_yotpo_select_page() {
+  if (variable_get('commerce_yotpo_id', FALSE) === FALSE) {
+    drupal_goto('admin/config/services/yotpo/register');
+  }
+  else {
+    drupal_goto('admin/config/services/yotpo/settings');
+  }
+}
+
+/**
  * Settings form
  */
 function commerce_yotpo_settings_form($form_state) {
@@ -81,8 +93,6 @@ function commerce_yotpo_settings_form_send_orders($form, &$form_state) {
  */
 function commerce_yotpo_register_form($form_state) {
 
-  global $base_url;
-
   $library = libraries_detect('yotpo-php');
   // Check if the expected library path exists
   if (!empty($library['installed'])) {
@@ -113,6 +123,10 @@ function commerce_yotpo_register_form($form_state) {
       '#value' => t('Register'),
     );
 
+    $form['yotpo_markup'] = array(
+      '#markup' => t('Already registered? <a href="@already_registered">Click here to enter your acount information and get started!</a>',
+        array('@already_registered' => url('admin/config/services/yotpo/settings'))));
+
     $form['introduction'] = array(
       '#type' => 'markup',
       '#markup' => '<p>' .
@@ -123,7 +137,15 @@ function commerce_yotpo_register_form($form_state) {
     // Set form redirect.
     $form['#redirect'] = 'admin/config/services/yotpo';
 
+    // If we already have an account.
+    if (variable_get('commerce_yotpo_id', FALSE) !== FALSE) {
+      $form['submit']['#disabled'] = TRUE;
+      drupal_set_message(t('You account is already configured. You can check you account settings <a href="@already_registered">on the settings page</a>.',
+        array('@already_registered' => url('admin/config/services/yotpo/settings'))));
+    }
+
   }
+
   else {
 
     drupal_set_message(t('Yotpo PHP library is required.'), 'error');
diff --git a/commerce_yotpo.module b/commerce_yotpo.module
index 9b5cf66..da7fd85 100644
--- a/commerce_yotpo.module
+++ b/commerce_yotpo.module
@@ -17,9 +17,8 @@ function commerce_yotpo_menu() {
 
   $items['admin/config/services/yotpo'] = array(
     'title' => 'Yotpo API',
-    'description' => 'Yotpo Connection Details',
-    'page callback' => 'drupal_get_form',
-    'page arguments' => array('commerce_yotpo_settings_form'),
+    'description' => 'Register with Yotpo',
+    'page callback' => 'commerce_yotpo_select_page',
     'file' => 'commerce_yotpo.admin.inc',
     'access arguments' => array('administer yotpo'),
     'type' => MENU_NORMAL_ITEM,
@@ -28,7 +27,11 @@ function commerce_yotpo_menu() {
   $items['admin/config/services/yotpo/settings'] = array(
     'title' => 'Settings',
     'description' => 'Yotpo Connection Details',
-    'type' => MENU_DEFAULT_LOCAL_TASK,
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('commerce_yotpo_settings_form'),
+    'file' => 'commerce_yotpo.admin.inc',
+    'access arguments' => array('administer yotpo'),
+    'type' => MENU_LOCAL_TASK,
   );
 
   $items['admin/config/services/yotpo/register'] = array(