fix FIRE-6721 (merge regression: commandline -login broken)
fix FIRE-6721 (merge regression: commandline -login broken)

gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm