diff --git a/cgi-bin/LJ/Setting/UserMessaging.pm b/cgi-bin/LJ/Setting/UserMessaging.pm
index 59cafbf2f3..a759f422eb 100644
--- a/cgi-bin/LJ/Setting/UserMessaging.pm
+++ b/cgi-bin/LJ/Setting/UserMessaging.pm
@@ -32,7 +32,7 @@ sub option {
     my ($class, $u, $errs, $args) = @_;
     my $key = $class->pkgkey;
 
-    my $usermsg = $class->get_arg($args, "usermsg") || $u->prop("opt_usermsg");
+    my $usermsg = $class->get_arg($args, "usermsg") || $u->opt_usermsg;
 
     my @options = (
         "Y" => $class->ml( 'setting.usermessaging.opt.y' ),
diff --git a/cgi-bin/LJ/User/Message.pm b/cgi-bin/LJ/User/Message.pm
index 4f70d1a65b..4e05d079b3 100644
--- a/cgi-bin/LJ/User/Message.pm
+++ b/cgi-bin/LJ/User/Message.pm
@@ -424,7 +424,6 @@ sub opt_usermsg {
     if ( defined $prop && $prop =~ /^(Y|F|M|N)$/ ) {
         return $prop;
     } else {
-        return 'M' if $u->is_minor;
         return 'Y';
     }
 }