login/edit: initial code cleanup to prepare for other columns