rebasing with add login form