#JC-1436 Fixed current password check