Added further check to make sure default password is not still being used.