PROJ-151 Fixed issue #23 et #25

Profile page fixes
Merge branch 'develop' of https://github.com/Inovitex/fcms into develop