Better password expiring warning handling