First pass for login/signup merge, see #8