#680 Clean up login script