2 new commits pushed to

<https://github.com/jmpsec/osctrl/tree/develop|develop>

by javuto

<https://github.com/jmpsec/osctrl/commit/4050ad683b34a58decec632c46c9e0fce912ef1a|4050ad68>

- Allow emails in usernames which facilitates SSO auth

<https://github.com/jmpsec/osctrl/commit/0bd042c4ff91c4e90352bac5f11d7fb09723ae92|0bd042c4>

- Merge pull request #987 from jmpsec/username-allow-emails jmpsec/osctrl