add User and fix bug