Merge pull request #190 from rmostafa/rmostafa-f1-pull2

Issues [#179, #180, #160] + Others Related to Login and Site Settings Initialization