diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index e1eef54..3a3a157 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -281,7 +281,7 @@ class UsersController < ApplicationController
         render action: "lost_password"
       end
     else
-      flash[:alert] = "Token or Email adress invalid!"
+      flash[:alert] = "Token or Email address invalid!"
       render action: "lost_password"
     end
   end
diff --git a/app/models/user.rb b/app/models/user.rb
index 83a075f..8743e5c 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -18,7 +18,7 @@ class User < ActiveRecord::Base
   validates_length_of :about, maximum: 5000
   validates_length_of :ign, minimum: 1, maximum: 16
 
-  validates :email, uniqueness: {case_sensitive: false}, format: {with: /\A.+@(.+\..{2,}|\[[0-9a-f:.]+\])\z/i, message: "That doesn't look like an email adress."}
+  validates :email, uniqueness: {case_sensitive: false}, format: {with: /\A.+@(.+\..{2,}|\[[0-9a-f:.]+\])\z/i, message: "That doesn't look like an email address."}
   validates :ign, uniqueness: {case_sensitive: false}, format: {with: /\A[a-z\d_]+\z/i, message: "Username is invalid (a-z, 0-9, _)."}
 
   validate :account_exists?, :if => lambda {|user| user.ign_changed? }
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
index 4851970..ec2d7d1 100644
--- a/app/views/users/edit.html.erb
+++ b/app/views/users/edit.html.erb
@@ -28,7 +28,7 @@
           </td>
         </tr>
         <tr>
-          <td>Confirmed email adress</td>
+          <td>Confirmed email address</td>
           <td>
             <%= f.select :confirmed, [["No", false], ["Yes", true]], {}, { disabled: !can_edit? } %>
           </td>
@@ -76,7 +76,7 @@
 
 <% if !@user.confirmed? %>
   <% if @user.is?(current_user) %>
-      <span class='red-alert'>Please confirm your email adress first!</span>
+      <span class='red-alert'>Please confirm your email address first!</span>
     <% else %>
       <span class='red-alert'>This user has not confirmed his email!</span>
     <% end %>
diff --git a/app/views/users/lost_password.html.erb b/app/views/users/lost_password.html.erb
index 791c37a..9be7bf3 100644
--- a/app/views/users/lost_password.html.erb
+++ b/app/views/users/lost_password.html.erb
@@ -2,12 +2,12 @@
 
 <h1>Reset password</h1>
 <p>You lost your password? Don't do that!</p>
-<p>Luckily for you, you can reset your password. Please use the command <code>/gettoken &lt;your email adress&gt;</code>, then fill in the form below:</p>
+<p>Luckily for you, you can reset your password. Please use the command <code>/gettoken &lt;your email address&gt;</code>, then fill in the form below:</p>
 <%= form_tag reset_password_users_path do |f| %>
   <table>
     <tr>
       <td><%= label_tag :email %></td>
-      <td><%= text_field_tag :email, nil, placeholder: "steve@example.com", required: true, pattern: ".+@.+", title: "enter valid email adress", "x-moz-errormessage" => "enter valid email adress" %></td>
+      <td><%= text_field_tag :email, nil, placeholder: "steve@example.com", required: true, pattern: ".+@.+", title: "enter valid email address", "x-moz-errormessage" => "enter valid email address" %></td>
     </tr>
     <tr>
       <td><%= label_tag :secret_token %></td>
diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb
index 2f3b582..c45810d 100644
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@@ -16,7 +16,7 @@
     </tr>
     <tr>
       <td><%= f.label :email, "Email" %></td>
-      <td><%= f.email_field :email, placeholder: "steve@example.com", required: true, pattern: ".+@.+", title: "enter valid email adress", "x-moz-errormessage" => "enter valid email adress" %></td>
+      <td><%= f.email_field :email, placeholder: "steve@example.com", required: true, pattern: ".+@.+", title: "enter valid email address", "x-moz-errormessage" => "enter valid email address" %></td>
     </tr>
     <tr>
       <td><%= f.label :registration_token, "Token" %></td>