Users controller bug fixes