Allowing username/password plus some cleanup