diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index a1a495c5bb7c5d21f8d6530df586431e209f69e1..eca3258b86d30bea1d9832ee46452288afbcbe22 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -53,7 +53,18 @@ class UsersController < ApplicationController
     @user_pages, @users = paginate :users, :per_page => 10
 
     if params[:id].nil?
-      @hide_logout = true
+      if cookies[:user_id].nil?
+          @hide_logout = true
+      else
+	user = User.find(cookies[:user_id])
+	if user.nil?
+	  flash.now[:notice] = "User id " + params[:id] + " not found"
+          @hide_logout = true
+        else
+          flash[:notice] = "Welcome back, " + user.username
+          redirect_to :controller => "recordings", :action => "list_owned"
+        end
+      end
       return
     end