#113 - code review
Merge pull request #211 from flower-platform/GH113-server-accounts-management-review

#113 - code review