#162|+Manan |Fixing build and user to  be case insensitive