Fixed a bug #195

@mohamedahmedawad93 
Please review the user id issue and merge