diff --git a/Gemfile b/Gemfile
index 268ddac..a36dae8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,7 +4,9 @@ source 'https://rubygems.org'
 gem 'rails', '4.0.1'
   
 
-gem 'bcrypt', '~> 3.1.7'
+#gem 'bcrypt', '~> 3.1.7'
+gem 'bcrypt-ruby', '~> 3.1.2'
+
 # Use sqlite3 as the database for Active Record
 #gem 'sqlite3'
 gem 'mysql2'
diff --git a/Gemfile.lock b/Gemfile.lock
index 85112d2..265ffe0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -36,6 +36,8 @@ GEM
       activerecord (>= 3.0.0)
     arel (4.0.2)
     bcrypt (3.1.13)
+    bcrypt-ruby (3.1.5)
+      bcrypt (>= 3.1.3)
     builder (3.1.4)
     capistrano (2.15.5)
       highline
@@ -173,7 +175,7 @@ PLATFORMS
 
 DEPENDENCIES
   acts_as_tree
-  bcrypt (~> 3.1.7)
+  bcrypt-ruby (~> 3.1.2)
   capistrano
   carrierwave
   coffee-rails (~> 4.0.0)