fixing issues
user module fix by ruchira