User Api Fixed