Password reset issues

Other BaridiMob issues: