1) Fix for empty user's password