Fixes: #2115 cleaning code to make the user tab to appears for zarafa