Password Issue fix