diff --git a/config/deploy.rb b/config/deploy.rb
index f77ee27..3acc1ea 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -36,7 +36,8 @@ set :nginx_listen, 80 # optional, default is not set
 set :nginx_roles, :all
 
 ## postgresql
-#set :pg_user, "thirteen_tien_len_#{fetch(:stage)}"
+set :pg_user, "thirteen_tien_len_#{fetch(:stage)}"
+set :pg_database, "thirteen_tien_len_#{fetch(:stage)}"
 
 namespace :db do
   desc 'Setup the database'
diff --git a/config/initializers/postgresql_database_tasks.rb b/config/initializers/postgresql_database_tasks.rb
new file mode 100644
index 0000000..b617cf2
--- /dev/null
+++ b/config/initializers/postgresql_database_tasks.rb
@@ -0,0 +1,11 @@
+module ActiveRecord
+  module Tasks
+    class PostgreSQLDatabaseTasks
+      def drop
+        establish_master_connection
+        connection.select_all "select pg_terminate_backend(pg_stat_activity.pid) from pg_stat_activity where datname='#{configuration['database']}' AND state='idle';"
+        connection.drop_database configuration['database']
+      end
+    end
+  end
+end