fix user/username, disable not working stuff