User management modification

@ahmadsoliman @sshihata @mayaammar @marwanelderwy 
#284