Removed the "baduser/badpassword" hack which does not work with Grizzly

Change-Id: Ied1f6cbbccbbd5b9b50fac09de6f5c083faccbb2