Merge login/register with master.