Clean up Login Response

Addresses #668