Updated Login & Registration

Change-Id: I225e44452fcb5ac62eaa11d7ec70459a2e9a5cf0