Fixed the guest user bugs

@abdelrahmanMaged Please review and merge