Register & Login more Stable

Made fix to differentiate between login and register flows