Issue #6766 - Make ;user=phone work again - imported from 1.2