Merge "Fix password not strong enough for cmd"