Revert "Merged incorrect username and incorrect password"

This reverts commit 8cd3458248f803066c86ac6f87d689e649bfefde.