CLC-3576 Fix logout on machines where dev login mode is enabled
Merge pull request #2357 from ctweney/clc-3576

CLC-3576 Fix logout on machines where dev login mode is enabled