Added Users and bug fixed