diff --git a/lib/csc/Controller/fax.pm b/lib/csc/Controller/fax.pm
index caab259..92fcb8e 100644
--- a/lib/csc/Controller/fax.pm
+++ b/lib/csc/Controller/fax.pm
@@ -9,18 +9,19 @@ use Data::Dumper;
 sub base :Chained('/') PathPrefix CaptureArgs(0) {
     my ($self, $c) = @_;
     return unless ($c->stash->{subscriber} = $c->forward('_load_subscriber'));
-    return unless ($c->stash->{fax_preferences} = $c->forward ('_load_fax_preferences'));
     $c->stash->{filetypes} = [qw/PS PDF PDF14 TIFF/];
 }
 
 sub view_preferences : Chained('base') PathPart('view') Args(0) {
     my ($self, $c) = @_;
+    return unless ($c->stash->{fax_preferences} = $c->forward ('_load_fax_preferences'));
     $c->stash->{template} = 'tt/fax.tt';
     $c->stash->{mode} = 'view';
 }
 
 sub edit_preferences : Chained('base') PathPart('edit') Args(0) {
     my ($self, $c) = @_;
+    return unless ($c->stash->{fax_preferences} = $c->forward ('_load_fax_preferences'));
     $c->stash->{template} = 'tt/fax.tt';
     $c->stash->{mode} = 'edit';
 }
@@ -30,16 +31,16 @@ sub save_preferences : Chained('base') PathPart('save') Args(0) {
 
     my $messages;
     my $password = undef;
-
+    
     if (defined $c->req->params->{password}) {
         if (defined $c->req->params->{password2}) {
             if ($c->req->params->{password} eq $c->req->params->{password2}) {
                 $password = $c->req->params->{password};
             } else {
-                $messages->{toperr} = 'Client.Voip.PassNoMatch';
+                $c->session->{messages}->{pwerr} = 'Client.Voip.PassNoMatch';
             }
         } else {
-            $messages->{toperr} = 'Client.Voip.MissingPass2';
+            $c->session->{messages}->{pwerr} = 'Client.Voip.MissingPass2';
         }
     }
 
@@ -72,8 +73,12 @@ sub save_preferences : Chained('base') PathPart('save') Args(0) {
         unless $c->req->params->{delete_destination} eq $i;
     }
 
-    $c->session->{messages} = $messages;
-    unless ($messages) {
+
+    if ($c->session->{messages}) {
+        $c->session->{messages}->{toperr} = 'Client.Voip.InputErrorFound';
+        $c->response->redirect($c->uri_for ('edit'));
+    }
+    else {
         if ($c->model('Provisioning')->call_prov( $c, 'voip', 'set_subscriber_fax_preferences',
             { username => $c->stash->{subscriber}->{username},
               domain =>   $c->stash->{subscriber}->{domain},
@@ -81,10 +86,10 @@ sub save_preferences : Chained('base') PathPart('save') Args(0) {
             },
             undef,
         )) {
-            $c->session->{messages} =  { topmsg => 'Server.Voip.SavedSettings' } ;
+            $c->session->{messages}->{topmsg} = 'Server.Voip.SavedSettings';
             $c->response->redirect($c->uri_for ('view'));
         } else {
-            $c->session->{messages} =  { toperr => 'Client.Voip.InputErrorFound' } ;
+            $c->session->{messages}->{toperr} = 'Client.Voip.InputErrorFound';
             $c->response->redirect($c->uri_for ('edit'));
         }
     }
diff --git a/root/tt/fax.tt b/root/tt/fax.tt
index 4ee3105..fe09dd1 100644
--- a/root/tt/fax.tt
+++ b/root/tt/fax.tt
@@ -10,6 +10,7 @@
     </div>
     <div id="toperr">
         <p> [% messages.toperr %] </p>
+        <p> [% messages.pwerr %] </p>
         <p> [% messages.prov_error %] </p>
     </div>
 
@@ -42,16 +43,16 @@
             <br clear="all" />
 
             <div class="span-2">[% Catalyst.loc('Active') %]</div>
-            <div class="prepend-1 span-2"><input [% IF mode == 'view' %]disabled="disabled"[% END %] type="checkbox" size="20" name="active" checked="[% IF fax_preferences.active %]checked[% END %]"/></div>
+            <div class="prepend-1 span-2"><input [% IF mode == 'view' %]disabled="disabled"[% END %] type="checkbox" size="20" name="active" [% IF fax_preferences.active == 1 %]checked="checked"[% END %]/></div>
             <br clear="all" />
 
             <div class="span-2">[% Catalyst.loc('Send status') %]</div>
-            <div class="prepend-1 span-2"><input [% IF mode == 'view' %]disabled="disabled"[% END %] type="checkbox" size="20" name="send_status" checked="[% IF fax_preferences.send_status %]checked[% END %]"/></div>
+            <div class="prepend-1 span-2"><input [% IF mode == 'view' %]disabled="disabled"[% END %] type="checkbox" size="20" name="send_status" [% IF fax_preferences.send_status == 1 %]checked="checked"[% END %]/></div>
             <br clear="all" />
 
             <div class="span-2">[% Catalyst.loc('Send copy') %]</div>
-            <div class="prepend-1 span-2"><input [% IF mode == 'view' %]disabled="disabled"[% END %] type="checkbox" size="20" name="send_copy" checked="[% IF fax_preferences.send_copy %]checked[% END %]"/></div>
-            <br clear="all" />
+            <div class="prepend-1 span-2"><input [% IF mode == 'view' %]disabled="disabled"[% END %] type="checkbox" size="20" name="send_copy" [% IF fax_preferences.send_copy == 1 %]checked="checked"[% END %]/></div>
+            <br clear="all" /> 
             
             <br clear="all" />