Fix for username/password not needed for non-secure modules