diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 678c1901..7cdcc80b 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 class UsersController < ApplicationController
+  before_action :load_user
   load_and_authorize_resource
 
   # GET /users/1
@@ -28,4 +29,9 @@ class UsersController < ApplicationController
     params.require(:user).permit(:name, :biography, :nickname, :affiliation,
                                   :picture, :picture_cache)
   end
+
+  # Somewhat of a hack: users/current/edit
+  def load_user
+    @user ||= (params[:user_id] && params[:user_id] != 'current' && User.find(params[:user_id]) || current_user)
+  end
 end