diff --git a/etc/admin.conf b/etc/admin.conf
index 8794b0a..6f3012d 100644
--- a/etc/admin.conf
+++ b/etc/admin.conf
@@ -5,6 +5,7 @@
         peering_features="[% www_admin.peering_features %]"
         voicemail_features="[% www_admin.voicemail_features %]"
         fax_features="[% www_admin.fax_features %]"
+        conference_features="[% www_admin.conference_features %]"
         customer_features="0"
         product_features="0"
         numberblock_features="0"
@@ -13,6 +14,7 @@
         ac_dial_prefix="[% www_admin.ac_dial_prefix %]"
         voicebox_domain="[% ossbss.provisioning.routing.voicebox_domain %]"
         fax2mail_domain="[% ossbss.provisioning.routing.fax2mail_domain %]"
+        conference_domain="[% ossbss.provisioning.routing.conference_domain %]"
        >
   <dashboard enabled="[% www_admin.dashboard.enabled %]" />
   <subscriber extension_features="[% www_admin.subscriber.extension_features %]"
diff --git a/lib/admin/Controller/subscriber.pm b/lib/admin/Controller/subscriber.pm
index 4934a14..325ab30 100644
--- a/lib/admin/Controller/subscriber.pm
+++ b/lib/admin/Controller/subscriber.pm
@@ -539,10 +539,13 @@ sub preferences : Local {
           if(defined $$preferences{$$pref{preference}} and length $$preferences{$$pref{preference}}) {
             my $vbdom = $c->config->{voicebox_domain};
             my $fmdom = $c->config->{fax2mail_domain};
+            my $confdom = $c->config->{conference_domain};
             if($$preferences{$$pref{preference}} =~ /\@$vbdom$/) {
               $$preferences{$$pref{preference}} = 'voicebox';
             } elsif($$preferences{$$pref{preference}} =~ /\@$fmdom$/) {
               $$preferences{$$pref{preference}} = 'fax2mail';
+            } elsif($$preferences{$$pref{preference}} =~ /\@$confdom$/) {
+              $$preferences{$$pref{preference}} = 'conference';
             }
           }
         } elsif(!$c->stash->{ncos_levels} and ($$pref{preference} eq 'ncos' or $$pref{preference} eq 'adm_ncos')) {
@@ -638,6 +641,7 @@ sub update_preferences : Local {
         {
             my $vbdom = $c->config->{voicebox_domain};
             my $fmdom = $c->config->{fax2mail_domain};
+            my $confdom = $c->config->{conference_domain};
 
             my $fwtype = $$db_pref{preference};
             my $fw_target_select = $c->request->params->{$fwtype .'_target'} || 'disable';
@@ -667,6 +671,8 @@ sub update_preferences : Local {
                 $fw_target = 'sip:vmu'.$c->session->{subscriber}{cc}.$c->session->{subscriber}{ac}.$c->session->{subscriber}{sn}."\@$vbdom";
             } elsif($fw_target_select eq 'fax2mail') {
                 $fw_target = 'sip:'.$c->session->{subscriber}{cc}.$c->session->{subscriber}{ac}.$c->session->{subscriber}{sn}."\@$fmdom";
+            } elsif($fw_target_select eq 'conference') {
+                $fw_target = 'sip:conf='.$c->session->{subscriber}{cc}.$c->session->{subscriber}{ac}.$c->session->{subscriber}{sn}."\@$confdom";
             }
             $$preferences{$fwtype} = $fw_target;
         } elsif($$db_pref{preference} eq 'cli') {
diff --git a/root/tt/subscriber_preferences.tt b/root/tt/subscriber_preferences.tt
index b0a039f..dd9a2bd 100644
--- a/root/tt/subscriber_preferences.tt
+++ b/root/tt/subscriber_preferences.tt
@@ -57,7 +57,7 @@
                   [% IF edit_preferences %]
                     <input type="radio" id="[% preference.key %]disable" value="disable" name="[% preference.key %]_target" class="radio"
                            [% IF preference.value == "" && ! preference.error %]checked="checked"[% END %] />
-                    <label for="[% preference.key %]disable">disable</label>
+                    <label for="[% preference.key %]disable">Disabled</label>
                     <br clear="all" />
                     [% IF Catalyst.config.voicemail_features %]
                     <input type="radio" id="[% preference.key %]voicebox" value="voicebox" name="[% preference.key %]_target" class="radio"
@@ -71,16 +71,25 @@
                     <label for="[% preference.key %]faxserver">Fax2Mail</label>
                     <br clear="all" />
                     [% END %]
+                    [% IF Catalyst.config.conference_features %]
+                    <input type="radio" id="[% preference.key %]conference" value="conference" name="[% preference.key %]_target" class="radio"
+                           [% IF preference.value == "conference" %]checked="checked"[% END %] />
+                    <label for="[% preference.key %]conference">Conference room</label>
+                    <br clear="all" />
+                    [% END %]
                     <input type="radio" id="[% preference.key %]sipuri" value="sipuri" name="[% preference.key %]_target" class="radio"
-                           [% IF (preference.value || preference.error) && preference.value != "voicebox" && preference.value != "fax2mail" %]checked="checked"[% END %] />
-                    <label for="[% preference.key %]sipuri">number or SIP-URI:</label>
+                           [% IF (preference.value || preference.error)
+                                 && preference.value != "voicebox" && preference.value != "fax2mail" && preference.value != "conference" %]checked="checked"[% END %] />
+                    <label for="[% preference.key %]sipuri">Number or SIP-URI:</label>
                     <input type="text" id="[% preference.key %]sipuritxt" name="[% preference.key %]_sipuri" size="25"
-                           value="[% preference.value UNLESS preference.value == "voicebox" OR preference.value == "fax2mail" %]" />
+                           value="[% preference.value UNLESS preference.value == "voicebox" OR preference.value == "fax2mail" OR preference.value == "conference" %]" />
                   [% ELSE %]
                     [% IF preference.value == "voicebox" %]
                       Voicebox
                     [% ELSIF preference.value == "fax2mail" %]
                       Fax2Mail
+                    [% ELSIF preference.value == "conference" %]
+                      Conference room
                     [% ELSE %]
                       <input type="text" size="25" value="[% preference.value %]"
                              class="disabled txtpreference" disabled="disabled" />