linked up the users
merged users and sapnas fixes