Add Pierre's gvpn-config long-/short-username fixes