diff --git a/src/components/pages/CallForward/CscAddDestinationForm.vue b/src/components/pages/CallForward/CscAddDestinationForm.vue
index da3523a5..2ced684e 100644
--- a/src/components/pages/CallForward/CscAddDestinationForm.vue
+++ b/src/components/pages/CallForward/CscAddDestinationForm.vue
@@ -1,35 +1,78 @@
 <template>
     <div class="add-destination-form">
-        <q-btn v-if="!isFormEnabled" flat color="primary" icon="fa-plus">
+        <q-btn
+            v-if="!isFormEnabled"
+            flat
+            color="primary"
+            icon="fa-plus"
+        >
             {{ $t('pages.callForward.addDestinationButton') }}
             <q-popover ref="popover">
-                <q-list separator link>
+                <q-list
+                    separator
+                    link
+                >
                     <q-item @click="enableForm('number'), $refs.popover.close()">
                         {{ $t('pages.callForward.buttons.addNumber') }}
                     </q-item>
                     <q-item @click="enableForm('voicebox'), $refs.popover.close()">
                         {{ $t('pages.callForward.buttons.addVoicemail') }}
                     </q-item>
-                    <q-item @click="enableForm('fax2mail'), $refs.popover.close()" v-if="hasFaxCapability">
+                    <q-item
+                        v-if="hasFaxCapability && hasSendFaxFeature"
+                        @click="enableForm('fax2mail'), $refs.popover.close()"
+                    >
                         {{ $t('pages.callForward.buttons.addFax2Mail') }}
                     </q-item>
                 </q-list>
             </q-popover>
         </q-btn>
         <div v-if="isFormEnabled">
-            <q-field :error="addFormError" :error-label="$t('pages.callForward.addInputError')">
-                <q-input :before="beforeIconDestination" :float-label="$t('pages.callForward.destination')" type="text"
-                    v-model="destinationForm.destination" @keyup.enter="addDestination()"
-                    :clearable="isFormTypeNumber" :autofocus="isFormTypeNumber"
-                    :disable="!isFormTypeNumber || addDestinationIsRequesting" />
+            <q-field
+                :error="addFormError"
+                :error-label="$t('pages.callForward.addInputError')"
+            >
+                <q-input
+                    :before="beforeIconDestination"
+                    :float-label="$t('pages.callForward.destination')"
+                    type="text"
+                    v-model="destinationForm.destination"
+                    @keyup.enter="addDestination()"
+                    :clearable="isFormTypeNumber"
+                    :autofocus="isFormTypeNumber"
+                    :disable="!isFormTypeNumber || addDestinationIsRequesting"
+                />
             </q-field>
-            <q-field :error="addFormError" :error-label="$t('pages.callForward.addInputError')">
-                <q-input :before="beforeIconTimeout" :float-label="$t('pages.callForward.timeout')"
-                    type="number" v-if="isFormTypeNumber" v-model="destinationForm.timeout"
-                    :min="0" :max="600" suffix="seconds" />
+            <q-field
+                :error="addFormError"
+                :error-label="$t('pages.callForward.addInputError')"
+            >
+                <q-input
+                    v-if="isFormTypeNumber"
+                    :before="beforeIconTimeout"
+                    :float-label="$t('pages.callForward.timeout')"
+                    type="number"
+                    v-model="destinationForm.timeout"
+                    :min="0"
+                    :max="600"
+                    suffix="seconds"
+                />
             </q-field>
-            <q-btn flat dark @click="disableForm()">{{ $t('buttons.cancel') }}</q-btn>
-            <q-btn flat color="primary" icon-right="fa-save" @click="addDestination()">{{ $t('buttons.save') }}</q-btn>
+            <q-btn
+                flat
+                dark
+                @click="disableForm()"
+            >
+                {{ $t('buttons.cancel') }}
+            </q-btn>
+            <q-btn
+                flat
+                color="primary"
+                icon-right="fa-save"
+                @click="addDestination()"
+            >
+                {{ $t('buttons.save') }}
+            </q-btn>
         </div>
     </div>
 </template>
@@ -77,9 +120,10 @@
             ...mapState('callForward', [
                 'activeForm',
                 'formType',
-                'addDestinationState'
+                'addDestinationState',
             ]),
-            ...mapGetters('callForward', [
+            ...mapGetters('user', [
+                'hasSendFaxFeature',
                 'hasFaxCapability'
             ]),
             isFormTypeNumber() {
diff --git a/src/components/pages/CallForward/CscDestination.vue b/src/components/pages/CallForward/CscDestination.vue
index 6c1c12a8..f0654396 100644
--- a/src/components/pages/CallForward/CscDestination.vue
+++ b/src/components/pages/CallForward/CscDestination.vue
@@ -29,7 +29,7 @@
                 </div>
                 <div v-if="$q.platform.is.mobile" class="dest-row" :class="{ terminated: destination.terminated, mobile: mobileClasses }">
                     <q-item-tile class="dest-values" label>
-                        <span v-if="!isNumber(destination.destination)">
+                        <span v-if="!isNonTerminating(destination.destination)">
                             <span v-if="index == 0">
                                 {{ $t('pages.callForward.firstRing') }}
                             </span>
@@ -40,13 +40,13 @@
                         {{ destination.destination | destinationFormat }}
                     </q-item-tile>
                     <q-item-tile class="dest-sublabel" sublabel>
-                        <span v-if="index == 0 && isNumber(destination.destination)">
+                        <span v-if="index == 0 && isNonTerminating(destination.destination)">
                             {{ $t('pages.callForward.firstRing') }}
                         </span>
-                        <span v-else-if="index > 0 && isNumber(destination.destination)">
+                        <span v-else-if="index > 0 && isNonTerminating(destination.destination)">
                             {{ $t('pages.callForward.thenRing') }}
                         </span>
-                        <span v-if="isNumber(destination.destination)">
+                        <span v-if="isNonTerminating(destination.destination)">
                             <span>
                                 {{ $t('pages.callForward.for') }}
                             </span>