Merge branch 'master' of github.com:bigbluebutton/greenlight

app/helpers/sessions_helper.rb

@@ -33,7 +33,7 @@ module SessionsHelper
   def check_email_verified(user)
     if user.activated?
       # Get the url to redirect the user to
-      url = if cookies[:return_to] && cookies[:return_to] != root_url
+      url = if cookies[:return_to] && ![root_url, signup_url].include?(cookies[:return_to])
         cookies[:return_to]
       else
         user.main_room

app/views/shared/_header.html.erb

@@ -62,8 +62,10 @@
             <%= link_to t("login"), omniauth_login_url(:ldap), :class => "btn btn-pill btn-outline-primary mx-2 sign-in-button" %>
           <% elsif allow_greenlight_accounts %>
             <%= link_to t("login"), "#loginModal", :class => "btn btn-pill btn-outline-primary mx-2 sign-in-button", "data-toggle": "modal" %>
-          <% else %>
+          <% elsif Rails.configuration.loadbalanced_configuration %>
             <%= link_to t("login"), omniauth_login_url(:bn_launcher), :class => "btn btn-pill btn-outline-primary mx-2 sign-in-button" %>
+          <% else %>
+            <%= link_to t("login"), "#loginModal", :class => "btn btn-pill btn-outline-primary mx-2 sign-in-button", "data-toggle": "modal" %>
           <% end %>
 
           <% if allow_user_signup? && allow_greenlight_accounts %>