Fix bugs in current and correct user