Do not crash when user has changed password

Change-Id: Ieeb10f0e6d053d8e0187c90a61e4de9023c4c36c
Merge "Do not crash when user has changed password"