added back in the current_user logic