diff --git a/Affinidi.php b/Affinidi.php
index 52e3b46..afff298 100644
--- a/Affinidi.php
+++ b/Affinidi.php
@@ -8,16 +8,19 @@
  */
 class Affinidi
 {
-    public $version = '1.0.0';
+    public $version = '1.1.0';
 
     public static $_instance = null;
 
     protected $default_settings = [
-        'active'               => 0,
         'client_id'            => '',
         'backend'              => '',
-        'redirect_to_dashboard'=> 0,
-        'login_only'           => 0,
+        'redirect_user_origin' => 0,
+        'enable_ecommerce_support' => '',
+        'ecommerce_sync_address_info' => 'billing',
+        'ecommerce_show_al_button' => 'top_form',
+        'affinidi_login_loginform_header' => 'Log in passwordless with',
+        'affinidi_login_regform_header' => 'Sign up seamlessly with',
     ];
 
     public function __construct()
diff --git a/includes/functions.php b/includes/functions.php
index 113449a..7862f62 100644
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -35,7 +35,7 @@ function affinidi_login_form_button()
  *
  * @return [type]       [description]
  */
-function affinidi_login_button_shortcode($atts)
+function affinidi_login_button_shortcode($atts = array())
 {
 
     if (is_user_logged_in()) {
@@ -46,7 +46,7 @@ function affinidi_login_button_shortcode($atts)
 
     $a = shortcode_atts([
         'title'  => 'Affinidi Login',
-        'class'  => 'button',
+        'class'  => 'affinidi-login',
         'target' => '_self',
         'text'   => 'Affinidi Login'
     ], $atts);
diff --git a/includes/wp-affinidi-login-callback.php b/includes/wp-affinidi-login-callback.php
index 39c7812..4a24dad 100644
--- a/includes/wp-affinidi-login-callback.php
+++ b/includes/wp-affinidi-login-callback.php
@@ -28,7 +28,7 @@
 // Check for error, ensure state has value
 if (empty($_GET['state'])) {
     // redirect user with error code
-    wp_safe_redirect($user_redirect . "?message=affinidi_login_failed_empty_state");
+    wp_safe_redirect(add_query_arg(array('message' => 'affinidi_login_failed_empty_state'), $user_redirect));
     exit;
 }
 
@@ -65,7 +65,7 @@
 // Check for error 
 if (empty($_GET['code']) && !empty($_GET['error_description'])) {
     // redirect user with error code
-    wp_safe_redirect(wp_login_url() . "?message=affinidi_login_failed");
+    wp_safe_redirect(add_query_arg(array('message' => 'affinidi_login_failed'), $user_redirect));
     
     exit;
 }
@@ -87,7 +87,7 @@
 // Check for error 
 if (empty($auth_code) && !empty($_GET['error_description'])) {
     // redirect user with error code
-    wp_safe_redirect(add_query_arg(array('message' => 'affinidi_login_failed'), $user_redirect));
+    wp_safe_redirect(add_query_arg(array('message' => 'affinidi_login_failed'), esc_url($user_redirect)));
     exit;
 }
 
@@ -117,7 +117,7 @@
 
     if (is_wp_error($response)) {
         // redirect user with error code
-        wp_safe_redirect(wp_login_url() . "?message=wp_error_affinidi_login");
+        wp_safe_redirect(add_query_arg(array('message' => 'affinidi_login_failed'), esc_url($user_redirect)));
         exit;
     }
 
@@ -125,7 +125,7 @@
 
     if (isset($tokens->error)) {
         // redirect user with error code
-        wp_safe_redirect(wp_login_url() . "?message=affinidi_login_failed");
+        wp_safe_redirect(add_query_arg(array('message' => 'affinidi_login_failed'), esc_url($user_redirect)));
         exit;
     }
     // parse ID Token from Affinidi Login response
@@ -141,7 +141,7 @@
 
     if (email_exists($userInfo['email']) == false) {
         if (affinidi_login_users_can_signup() == 0) {
-            wp_safe_redirect(wp_login_url() . '?message=affinidi_login_only');
+            wp_safe_redirect(add_query_arg(array('message' => 'affinidi_login_only'), esc_url($user_redirect)));
             exit;
         }
 
@@ -160,7 +160,7 @@
 
         if (empty($user_id)) {
             // redirect user with error code
-            wp_safe_redirect(wp_login_url() . "?message=affinidi_login_failed");
+            wp_safe_redirect(add_query_arg(array('message' => 'affinidi_login_failed'), esc_url($user_redirect)));
             exit;
         }
 
@@ -191,13 +191,7 @@
 
         if (!$user) {
             // redirect user with error code
-            wp_safe_redirect(wp_login_url() . "?message=affinidi_login_failed");
-            exit;
-        }
-
-        if (empty($user->ID)) {
-            // redirect user with error code
-            wp_safe_redirect(wp_login_url() . "?message=affinidi_login_failed");
+            wp_safe_redirect(add_query_arg(array('message' => 'affinidi_login_failed'), esc_url($user_redirect)));
             exit;
         }
 
diff --git a/includes/wp-affinidi-login-wc.php b/includes/wp-affinidi-login-wc.php
index dc9d6f9..b84b1d7 100644
--- a/includes/wp-affinidi-login-wc.php
+++ b/includes/wp-affinidi-login-wc.php
@@ -67,7 +67,7 @@ public function filter_affinidi_login_wc_login()
             <div>%s</div>
             </div>',
             esc_html($this->admin_options->affinidi_login_loginform_header),
-            affinidi_login_button_shortcode(array())
+            affinidi_login_button_shortcode()
         );
     
         echo wp_kses_post($affinidi_login_form_button);
@@ -81,7 +81,7 @@ public function filter_affinidi_login_wc_registration()
             <div>%s</div>
             </div>',
             esc_html($this->admin_options->affinidi_login_regform_header),
-            affinidi_login_button_shortcode(array())
+            affinidi_login_button_shortcode()
         );
     
         echo wp_kses_post($affinidi_login_form_button);