diff --git a/Irpg/Users.pm b/Irpg/Users.pm
index cf8e5e5cf324aafd08b0dc46458823f94dde91d5..4b7592c8155ded94d50a4c2cc597f74cf616ca75 100644
--- a/Irpg/Users.pm
+++ b/Irpg/Users.pm
@@ -357,7 +357,7 @@ sub points {
     if (!@arg) {
         Irpg::Irc::privmsg("Your raw competences are the following: ".
             join(', ', map { uc($_)." $rps->{$username}{stats}{$_}" }
-                        keys($rps->{$username}{stats})).".", $source);
+                        qw(str con int wis cha dex)).".", $source);
         return;
     }
     if (@arg != 2 || $arg[1] !~ m/^\d+$/) {
@@ -396,10 +396,11 @@ sub class {
     }
     else {
         my $cname = $rps->{$asked}{class}->{NAME};
-        Irpg::Irc::privmsg("You are a".($cname =~ m/^[AEIOUYƌ].*/ ? 'n':'').
+		my $who = $asked eq $username ? 'You are' : "$asked is";
+        Irpg::Irc::privmsg("$who a".($cname =~ m/^[AEIOUYƌ].*/ ? 'n':'').
             " $cname with the following stats: ".
             join(', ', map { uc($_)." ".eval('$rps->{$asked}{class}->'.$_.'()') }
-                        keys($rps->{$asked}{stats})).".", $source);
+                        qw(str con int wis cha dex)).".", $source);
         return;
     }
 }