Fixed invalid pwd message when no pwd