Fixes: #2143 Improved Cyrus service dialog