diff --git a/Gemfile b/Gemfile
index 2185b18..2912cf1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@ ruby '2.0.0'
 # Application gems
 gem 'rails', '4.0.0'
 gem 'jquery-rails'
-gem 'devise', '~> 3.1.1'
+gem 'devise'
 gem 'simple_form', '~> 3.0.0.rc'
 gem "paperclip", "~> 3.0"
 gem "paperclip-dropbox"
@@ -21,6 +21,7 @@ end
 
 group :development, :test do
 	gem 'sqlite3'
+	gem "better_errors"
 end
 
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 68f36d1..b6630bc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -34,6 +34,9 @@ GEM
       nokogiri (>= 1.4.4)
       uuidtools (~> 2.1)
     bcrypt-ruby (3.1.2)
+    better_errors (1.0.1)
+      coderay (>= 1.0.0)
+      erubis (>= 2.6.6)
     bootstrap-sass (3.0.3.0)
       sass (~> 3.2)
     bootstrap-will_paginate (0.0.10)
@@ -43,6 +46,7 @@ GEM
       activesupport (>= 3.0)
     cocaine (0.5.3)
       climate_control (>= 0.0.3, < 1.0)
+    coderay (1.1.0)
     coffee-rails (4.0.1)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.0)
@@ -170,10 +174,11 @@ PLATFORMS
 DEPENDENCIES
   acts_as_follower
   aws-sdk (~> 1.5.7)
+  better_errors
   bootstrap-sass (~> 3.0.3.0)
   bootstrap-will_paginate
   coffee-rails (~> 4.0.0)
-  devise (~> 3.1.1)
+  devise
   faker (~> 1.2.0)
   jbuilder (= 1.2)
   jquery-rails
diff --git a/app/models/user.rb b/app/models/user.rb
index 3f3f5d2..d617883 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,7 +1,7 @@
 class User < ActiveRecord::Base
   # Include default devise modules. Others available are:
   # :confirmable, :lockable, :timeoutable and :omniauthable
-  devise :database_authenticatable, :registerable, #:recoverable,
+  devise :database_authenticatable, :registerable, :recoverable,
           :rememberable, :trackable, :validatable
 	attr_accessible :email, :password, :password_confirmation, :remember_me, :name, :provider, :uid, :as => [:default, :admin]
 
diff --git a/app/views/devise/shared/_links.erb b/app/views/devise/shared/_links.erb
index d84bdde..5bf8fb2 100644
--- a/app/views/devise/shared/_links.erb
+++ b/app/views/devise/shared/_links.erb
@@ -7,7 +7,7 @@
 <% end -%>
 
 <%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>
-  <%= link_to "Forgot your password?", new_password_path(resource_name) %><br />
+  <%= link_to "Forgot your password?", new_user_password_path(resource_name) %><br />
 <% end -%>
 
 <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>