Feature/575 and Feature/577

This is a fix for:

* https://github.com/globaleaks/GlobaLeaks/issues/577

and for:

* https://github.com/globaleaks/GlobaLeaks/issues/575