Pull Request: Fix_C5_Khaled_216_Add_User_Authentication_Advanced_5.9_5.10_5.11_5.14_5.15

Issue #396 
Reviewers: @ahmedhagii @rami-khalil