diff --git a/vedia.rb b/vedia.rb
index 461ab83..cd83c2e 100644
--- a/vedia.rb
+++ b/vedia.rb
@@ -102,7 +102,7 @@ get '/signup' do
 end
 
 post '/signup' do
-  @user = User.create(email: params[:email])
+  @user = User.create(email: params[:email].downcase.strip)
   @errors = []
   if params[:password].empty?
     @errors << OpenStruct.new(:attribute => :password, :type => :blank)
@@ -126,7 +126,7 @@ get '/login' do
 end
 
 post '/login' do
-  user = User.find_by(email: params[:email])
+  user = User.find_by(email: params[:email].downcase.strip)
   if user && verify_password(params[:password], user.password)
     if not user.reset.nil?
       user.reset = nil
@@ -151,6 +151,7 @@ get '/reset' do
 end
 
 post '/reset' do
+  params[:email].downcase!.strip!
   logger.info "Password reset request for \"#{params[:email]}\""
   @errors = []
   if not params[:email] =~ URI::MailTo::EMAIL_REGEXP