diff --git a/app/controllers/verification/email_controller.rb b/app/controllers/verification/email_controller.rb
index ebcbf68ab..2fe232576 100644
--- a/app/controllers/verification/email_controller.rb
+++ b/app/controllers/verification/email_controller.rb
@@ -4,7 +4,7 @@ class Verification::EmailController < ApplicationController
   skip_authorization_check
 
   def show
-    if Email.find(current_user, params[:email_verification_token])
+    if Verification::Email.find(current_user, params[:email_verification_token])
       current_user.update(verified_at: Time.now)
       redirect_to account_path, notice: t('verification.email.show.flash.success')
     else
@@ -13,7 +13,7 @@ class Verification::EmailController < ApplicationController
   end
 
   def create
-    @email = Email.new(@verified_user)
+    @email = Verification::Email.new(@verified_user)
     if @email.save
       current_user.reload
       Mailer.email_verification(current_user, @email.recipient, @email.encrypted_token).deliver_now
diff --git a/app/models/email.rb b/app/models/verification/email.rb
similarity index 97%
rename from app/models/email.rb
rename to app/models/verification/email.rb
index e5e15c49f..dad706b52 100644
--- a/app/models/email.rb
+++ b/app/models/verification/email.rb
@@ -1,4 +1,4 @@
-class Email
+class Verification::Email
   include ActiveModel::Model
 
   attr_accessor :verified_user, :recipient, :plain_token, :encrypted_token
diff --git a/app/views/verification/email/_form.html.erb b/app/views/verification/email/_form.html.erb
index 94039e5e2..7314e568c 100644
--- a/app/views/verification/email/_form.html.erb
+++ b/app/views/verification/email/_form.html.erb
@@ -1,4 +1,4 @@
-<%= form_for Email.new(verified_user), url: email_path, method: :post do |f| %>
+<%= form_for Verification::Email.new(verified_user), as: "email", url: email_path, method: :post do |f| %>
   <%= hidden_field_tag :recipient, verified_user.email %>
   <%= f.submit t('verification.email.form.submit_button') %>
 <% end %>
\ No newline at end of file