diff --git a/app/assets/javascripts/discourse/controllers/login.js.es6 b/app/assets/javascripts/discourse/controllers/login.js.es6
index 8d52622104c..e6309349841 100644
--- a/app/assets/javascripts/discourse/controllers/login.js.es6
+++ b/app/assets/javascripts/discourse/controllers/login.js.es6
@@ -114,7 +114,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
         customLogin();
       } else {
         var authUrl = Discourse.getURL("/auth/" + name);
-        if (loginMethod.get("full_screen_login")) {
+        if (loginMethod.get("fullScreenLogin")) {
           window.location = authUrl;
         } else {
           this.set('authenticate', name);
diff --git a/app/views/users/omniauth_callbacks/complete.html.erb b/app/views/users/omniauth_callbacks/complete.html.erb
index d6c6eeb7b57..8bd92bcb719 100644
--- a/app/views/users/omniauth_callbacks/complete.html.erb
+++ b/app/views/users/omniauth_callbacks/complete.html.erb
@@ -26,7 +26,7 @@
         window.opener.Discourse.authenticationComplete(<%=@auth_result.to_client_hash.to_json.html_safe%>);
         window.close();
       } else {
-        window.location = <%= @origin.inspect %>;
+        window.location = <%= @origin.inspect.html_safe %>;
       }
     </script>
   </div>
diff --git a/lib/plugin/auth_provider.rb b/lib/plugin/auth_provider.rb
index 8db104f3ef4..cbc12c6f450 100644
--- a/lib/plugin/auth_provider.rb
+++ b/lib/plugin/auth_provider.rb
@@ -2,7 +2,7 @@ class Plugin::AuthProvider
 
   def self.auth_attributes
     [:glyph, :background_color, :title, :message, :frame_width, :frame_height, :authenticator,
-     :title_setting, :enabled_setting]
+     :title_setting, :enabled_setting, :full_screen_login]
   end
 
   attr_accessor(*auth_attributes)
@@ -19,6 +19,7 @@ class Plugin::AuthProvider
     result['messageOverride'] = message if message
     result['frameWidth'] = frame_width if frame_width
     result['frameHeight'] = frame_height if frame_height
+    result['fullScreenLogin'] = full_screen_login if full_screen_login
     result.to_json
   end