Merge with UI for login and registration pages