diff --git a/webapp/titanembeds/static/js/embed.js b/webapp/titanembeds/static/js/embed.js
index 958db29..6346457 100644
--- a/webapp/titanembeds/static/js/embed.js
+++ b/webapp/titanembeds/static/js/embed.js
@@ -368,9 +368,11 @@
         lock_login_fields();
 
         var guild = query_guild();
-        guild.fail(function() {
+        guild.fail(function(data) {
             unlock_login_fields();
-            if (visitors_enabled) {
+            if (data.status == 403 && getParameterByName("create_authenticated_user") == "true" && getParameterByName("sametarget") == "true") {
+                wait_for_discord_login();
+            } else if (visitors_enabled) {
                 setVisitorMode(true);
                 var guild2 = query_guild();
                 guild2.done(function(data) {
diff --git a/webapp/titanembeds/templates/embed.html.j2 b/webapp/titanembeds/templates/embed.html.j2
index 82606ed..dc6ab4f 100644
--- a/webapp/titanembeds/templates/embed.html.j2
+++ b/webapp/titanembeds/templates/embed.html.j2
@@ -102,7 +102,7 @@
               </div>
               <div class="row">
                 <div class="col s12 l4">
-                  <a id="discordlogin_btn" href="{% if not same_target %}{{ url_for("embed.login_discord", _external=True) }}{% else %}{{ url_for("user.login_authenticated", redirect=request.url, _external=True) }}{% endif %}" class="waves-effect waves-light btn-large" {% if not same_target %}target="_blank"{% endif %}>{{ _("Discord Login") }}</a>
+                  <a id="discordlogin_btn" href="{% if not same_target %}{{ url_for("embed.login_discord", _external=True) }}{% else %}{{ url_for("user.login_authenticated", redirect=request.url+"&create_authenticated_user=true", _external=True) }}{% endif %}" class="waves-effect waves-light btn-large" {% if not same_target %}target="_blank"{% endif %}>{{ _("Discord Login") }}</a>
                   <p>*{{ _("You will be invited into this server.") }}</p>
                 </div>
                 {% if unauth_enabled %}
diff --git a/webapp/titanembeds/utils.py b/webapp/titanembeds/utils.py
index 1099782..889842d 100644
--- a/webapp/titanembeds/utils.py
+++ b/webapp/titanembeds/utils.py
@@ -95,7 +95,7 @@ def checkUserRevoke(guild_id, user_key=None):
         dbUser = GuildMembers.query.filter(GuildMembers.guild_id == guild_id).filter(GuildMembers.user_id == session["user_id"]).first()
         revoked = not dbUser or not dbUser.active
     return revoked
-
+    
 def checkUserBanned(guild_id, ip_address=None):
     banned = True
     if user_unauthenticated():