diff --git a/app/app.rb b/app/app.rb
index 9552ac9..38cf76d 100644
--- a/app/app.rb
+++ b/app/app.rb
@@ -8,17 +8,12 @@ class App < Padrino::Application
     helpers Activate::ParamHelpers
     helpers Activate::NavigationHelpers
 
-    enable :sessions
-
     if ENV['SSL']
       use Rack::SslEnforcer
-      use Rack::Session::Cookie, :key => '_rack_session', :path => '/', :expire_after => 30*24*60*60, :secret => ENV['SESSION_SECRET']
-    else
-      set :sessions, :expire_after => 1.year
     end
 
     def initialize
-      unless ActiveRecord::Base.connection.active?
+      unless ActiveRecord::Base.connection.active? || ActiveRecord::Base.connection_pool.active_connection?
         if ENV['DATABASE_URL'] and ENV['DATABASE_SCHEMA']
           ActiveRecord::Base.establish_connection(ENV['DATABASE_URL'])
           ActiveRecord::Base.connection.schema_search_path = ENV['DATABASE_SCHEMA']
@@ -410,7 +405,7 @@ def initialize
       if account = Account.authenticate(params[:email], params[:password])
         session[:account_id] = account.id
         flash[:notice] = "Logged in successfully."
-        redirect url(:home)
+        redirect params[:redir] or url(:home)
       elsif Padrino.env == :development && params[:bypass]
         account = Account.first
         session[:account_id] = account.id
diff --git a/app/views/login.erb b/app/views/login.erb
index ccf69bb..6848da4 100644
--- a/app/views/login.erb
+++ b/app/views/login.erb
@@ -1,6 +1,10 @@
 
 <% form_tag url(:login), :class => 'form-horizontal' do %>
 
+  <% if params[:redir] %>
+    <%= hidden_field_tag :redir, :value => params[:redir] %>
+  <% end %>
+
   <div class="form-group">
     <label class="control-label col-sm-3">Email</label>
     <div class="col-sm-3">