[#1680] Reorder Sign in/Sign up forms

Fixes #1680