Current user bug fixed