1.3.6 release + config/user-id bugfix