Fixed CS
Made the authentication dependend on the username and password