Moved signup code lookup to own method