Merge "Allow putting the app ID in the password for bot passwords"