Fixes: #1925 Cyrus connect bug