Fix for username and password