Minor update on both UI and WebApi AccountContoller