diff --git a/Capfile b/Capfile
index b6a7736a..01c6769a 100644
--- a/Capfile
+++ b/Capfile
@@ -4,6 +4,7 @@ require 'capistrano/setup'
 # Includes default deployment tasks
 require 'capistrano/deploy'
 require "capistrano/scm/git"
+install_plugin Capistrano::SCM::Git
 # Includes tasks from other gems included in your Gemfile
 #
 # For documentation on these, see for example:
diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb
index dd32c759..5120cd82 100644
--- a/app/controllers/users/omniauth_callbacks_controller.rb
+++ b/app/controllers/users/omniauth_callbacks_controller.rb
@@ -10,9 +10,9 @@ class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
     @user = User.find_for_oauth(request.env["omniauth.auth"], current_user)
 
     if @user.persisted?
-      flash[:notice] = I18n.t "devise.omniauth_callbacks.success", :kind => @user.provider.to_s.capitalize
+      flash[:notice] = I18n.t "devise.omniauth_callbacks.success", kind: @user.provider.to_s.capitalize
       sign_in @user
-      redirect_to user_obtain_token_path, :event => :authentication, :current_user => @user
+      redirect_to user_obtain_token_path, event: :authentication, current_user: @user
     else
       session["devise.facebook_data"] = request.env["omniauth.auth"]
       Rails.logger.error("Failed to persist user: #{@user.errors.full_messages.join(', ')}")
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 22bb70ab..f81049c8 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -46,7 +46,8 @@ Qwaiter::Application.configure do
   # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
 
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
-  config.force_ssl = true
+  #NOTE: DO NOT ACTIVATE force_ssl, this causes an infinite redirect loop and is handled by nginx
+  #config.force_ssl = true
 
   # See everything in the log (default is :info)
   # config.log_level = :debug
diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb
new file mode 100644
index 00000000..513216ae
--- /dev/null
+++ b/config/initializers/omniauth.rb
@@ -0,0 +1,2 @@
+OmniAuth.config.full_host = Rails.env.production? ? 'https://www.mozo.bar' : 'https://www.mozo.local'
+