Login tokens weren't generated in a couple places

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
Merge pull request #540 from Oldiesmann/release-2.1

Login tokens weren't generated in a couple places (fixes #531)