minor scoping changes in user controller