diff --git a/app/controllers/password_resets_controller.rb b/app/controllers/password_resets_controller.rb
index be83ec3a..b7584890 100644
--- a/app/controllers/password_resets_controller.rb
+++ b/app/controllers/password_resets_controller.rb
@@ -1,6 +1,8 @@
 class PasswordResetsController < ApplicationController
   layout "auth"
 
+  before_action :set_user_by_token, only: :update
+
   def new
   end
 
@@ -12,7 +14,7 @@ class PasswordResetsController < ApplicationController
       ).password_reset.deliver_later
     end
 
-    redirect_to root_path, notice: "If an account with that email exists, we have sent a link to reset your password."
+    redirect_to root_path, notice: t(".requested")
   end
 
   def edit
@@ -20,7 +22,7 @@ class PasswordResetsController < ApplicationController
 
   def update
     if @user.update(password_params)
-      redirect_to new_session_path, notice: "Your password has been reset."
+      redirect_to new_session_path, notice: t(".success")
     else
       render :edit, status: :unprocessable_entity
     end
@@ -30,7 +32,7 @@ class PasswordResetsController < ApplicationController
 
   def set_user_by_token
     @user = User.find_by_token_for(password_reset: params[:token])
-    redirect_to new_password_reset_path, alert: "Invalid token." unless @user.present?
+    redirect_to new_password_reset_path, alert: t("password_resets.update.invalid_token") unless @user.present?
   end
 
   def password_params
diff --git a/app/controllers/passwords_controller.rb b/app/controllers/passwords_controller.rb
index cf28c08e..b1e859c6 100644
--- a/app/controllers/passwords_controller.rb
+++ b/app/controllers/passwords_controller.rb
@@ -6,7 +6,7 @@ class PasswordsController < ApplicationController
 
   def update
     if current_user.update(password_params)
-      redirect_to root_path, notice: "Your password has been updated successfully."
+      redirect_to root_path, notice: t(".success")
     else
       render :edit, status: :unprocessable_entity
     end
diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb
index 3973ddbf..886962e3 100644
--- a/app/controllers/registrations_controller.rb
+++ b/app/controllers/registrations_controller.rb
@@ -14,10 +14,10 @@ class RegistrationsController < ApplicationController
 
     if @user.save
       login @user
-      flash[:notice] = "You have signed up successfully."
+      flash[:notice] = t(".success")
       redirect_to root_path
     else
-      flash[:alert] = "Invalid input, please try again."
+      flash[:alert] = t(".failure")
       render :new
     end
   end
@@ -34,7 +34,7 @@ class RegistrationsController < ApplicationController
 
   def claim_invite_code
     unless InviteCode.claim! params[:user][:invite_code]
-      redirect_to new_registration_path, alert: "Invalid invite code, please try again."
+      redirect_to new_registration_path, alert: t("registrations.create.invalid_invite_code")
     end
   end
 end
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 468ab024..4bf52314 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -9,13 +9,13 @@ class SessionsController < ApplicationController
       login user
       redirect_to root_path
     else
-      flash.now[:alert] = "Invalid email or password."
+      flash.now[:alert] = t(".invalid_credentials")
       render :new, status: :unprocessable_entity
     end
   end
 
   def destroy
     logout
-    redirect_to root_path, notice: "You have signed out successfully."
+    redirect_to root_path, notice: t(".logout_successful")
   end
 end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6c349ae5..527b4de8 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1,31 +1,22 @@
-# Files in the config/locales directory are used for internationalization and
-# are automatically loaded by Rails. If you want to use locales other than
-# English, add the necessary files in this directory.
-#
-# To use the locales, use `I18n.t`:
-#
-#     I18n.t "hello"
-#
-# In views, this is aliased to just `t`:
-#
-#     <%= t("hello") %>
-#
-# To use a different locale, set it with `I18n.locale`:
-#
-#     I18n.locale = :es
-#
-# This would use the information in config/locales/es.yml.
-#
-# To learn more about the API, please read the Rails Internationalization guide
-# at https://guides.rubyonrails.org/i18n.html.
-#
-# Be aware that YAML interprets the following case-insensitive strings as
-# booleans: `true`, `false`, `on`, `off`, `yes`, `no`. Therefore, these strings
-# must be quoted to be interpreted as strings. For example:
-#
-#     en:
-#       "yes": yup
-#       enabled: "ON"
-
+---
 en:
-  hello: "Hello world"
+  password_resets:
+    create:
+      requested: If an account with that email exists, we have sent a link to reset
+        your password.
+    update:
+      invalid_token: Invalid token.
+      success: Your password has been reset.
+  passwords:
+    update:
+      success: Your password has been updated successfully.
+  registrations:
+    create:
+      failure: Invalid input, please try again.
+      invalid_invite_code: Invalid invite code, please try again.
+      success: You have signed up successfully.
+  sessions:
+    create:
+      invalid_credentials: Invalid email or password.
+    destroy:
+      logout_successful: You have signed out successfully.