diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 71d3d6ea..f9ef3f45 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,7 +1,7 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
 
-  before_filter :get_invite_link
+  before_action :get_invite_link
   after_action :allow_embedding
   
   # this is for global login
@@ -12,13 +12,7 @@ class ApplicationController < ActionController::Base
   helper_method :admin?
   
   def after_sign_in_path_for(resource)
-    unsafe_uri = request.env["REQUEST_URI"]
-    if unsafe_uri.starts_with?('http') && !unsafe_uri.starts_with?('https')
-      protocol = 'http'
-    else
-      protocol = 'https'
-    end
-    sign_in_url = url_for(:action => 'new', :controller => 'sessions', :only_path => false, :protocol => protocol)
+    sign_in_url = url_for(:action => 'new', :controller => 'sessions', :only_path => false, :protocol => 'https')
 
     if request.referer == sign_in_url
       super
diff --git a/app/controllers/mappings_controller.rb b/app/controllers/mappings_controller.rb
index c20b0153..6ce37234 100644
--- a/app/controllers/mappings_controller.rb
+++ b/app/controllers/mappings_controller.rb
@@ -1,6 +1,6 @@
 class MappingsController < ApplicationController
   
-  before_filter :require_user, only: [:create, :update, :destroy]    
+  before_action :require_user, only: [:create, :update, :destroy]    
     
   respond_to :json
     
diff --git a/app/controllers/maps_controller.rb b/app/controllers/maps_controller.rb
index 9ad05810..f3bdda49 100644
--- a/app/controllers/maps_controller.rb
+++ b/app/controllers/maps_controller.rb
@@ -1,5 +1,5 @@
 class MapsController < ApplicationController
-    before_filter :require_user, only: [:create, :update, :screenshot, :destroy]
+    before_action :require_user, only: [:create, :update, :screenshot, :destroy]
 
     respond_to :html, :json
 
diff --git a/app/controllers/metacode_sets_controller.rb b/app/controllers/metacode_sets_controller.rb
index 720076c1..e76f4c9a 100644
--- a/app/controllers/metacode_sets_controller.rb
+++ b/app/controllers/metacode_sets_controller.rb
@@ -1,6 +1,6 @@
 class MetacodeSetsController < ApplicationController
   
-  before_filter :require_admin
+  before_action :require_admin
 
   # GET /metacode_sets
   # GET /metacode_sets.json
diff --git a/app/controllers/metacodes_controller.rb b/app/controllers/metacodes_controller.rb
index 54956c60..77f9ba54 100644
--- a/app/controllers/metacodes_controller.rb
+++ b/app/controllers/metacodes_controller.rb
@@ -1,5 +1,5 @@
 class MetacodesController < ApplicationController
-  before_filter :require_admin, except: [:index]
+  before_action :require_admin, except: [:index]
     
   # GET /metacodes
   # GET /metacodes.json
diff --git a/app/controllers/synapses_controller.rb b/app/controllers/synapses_controller.rb
index f19dc053..4bf7cffb 100644
--- a/app/controllers/synapses_controller.rb
+++ b/app/controllers/synapses_controller.rb
@@ -1,7 +1,7 @@
 class SynapsesController < ApplicationController
   include TopicsHelper
 
-  before_filter :require_user, only: [:create, :update, :destroy]
+  before_action :require_user, only: [:create, :update, :destroy]
     
   respond_to :json
   
diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb
index 19062ba9..5b9da340 100644
--- a/app/controllers/topics_controller.rb
+++ b/app/controllers/topics_controller.rb
@@ -1,7 +1,7 @@
 class TopicsController < ApplicationController
     include TopicsHelper
 
-    before_filter :require_user, only: [:create, :update, :destroy]
+    before_action :require_user, only: [:create, :update, :destroy]
 
     respond_to :html, :js, :json
 
diff --git a/app/controllers/users/registrations_controller.rb b/app/controllers/users/registrations_controller.rb
index c77edb50..88474e21 100644
--- a/app/controllers/users/registrations_controller.rb
+++ b/app/controllers/users/registrations_controller.rb
@@ -1,6 +1,6 @@
 class Users::RegistrationsController < Devise::RegistrationsController
-  before_filter :configure_sign_up_params, only: [:create]
-  before_filter :configure_account_update_params, only: [:update]
+  before_action :configure_sign_up_params, only: [:create]
+  before_action :configure_account_update_params, only: [:update]
 
   protected
     def after_sign_up_path_for(resource)
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 063ab866..f5b0aab9 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1,5 +1,5 @@
 class UsersController < ApplicationController
-  before_filter :require_user, only: [:edit, :update, :updatemetacodes]
+  before_action :require_user, only: [:edit, :update, :updatemetacodes]
     
   respond_to :html, :json