Page crashed when incorrect password entered, this fixes it.
Merge remote-tracking branch 'origin/dev-AMEC-2323' into dev-AMEC-2323