diff --git a/app/controllers/spree/admin/comments_controller.rb b/app/controllers/spree/admin/comments_controller.rb
index eab12ee..120a41b 100644
--- a/app/controllers/spree/admin/comments_controller.rb
+++ b/app/controllers/spree/admin/comments_controller.rb
@@ -1,7 +1,9 @@
 class Spree::Admin::CommentsController < Spree::Admin::ResourceController
   private
-  
+
   def location_after_save
-    :back
+    # :back is deprecated in Rails 5, but request.referrer should also work as intended on older versions (confirmed to work on Rails 4 and 5)
+    request.referrer
   end
-end
\ No newline at end of file
+
+end
diff --git a/app/overrides/add_comment_configuration.rb b/app/overrides/add_comment_configuration.rb
index 25a7637..a82348c 100644
--- a/app/overrides/add_comment_configuration.rb
+++ b/app/overrides/add_comment_configuration.rb
@@ -1,5 +1,5 @@
 Deface::Override.new(:virtual_path => "spree/admin/shared/sub_menu/_configuration",
                      :name => "converted_admin_configurations_menu_468573024",
                      :insert_bottom => "[data-hook='admin_configurations_sidebar_menu']",
-                     :text => "<%= configurations_sidebar_menu_item Spree.t(:comment_types), admin_comment_types_path %>",
-                     :disabled => false)
\ No newline at end of file
+                     :text => "<%- if spree_current_user.admin? %><%= configurations_sidebar_menu_item Spree.t(:comment_types), admin_comment_types_path %><% end %>",
+                     :disabled => false)