Merge "Fix separated login link so that create account and login are always next...