Fixes current_user bug