Refactor and fix current_user bug