Fix bug 883189 - Clean up Make Editor login process