diff --git a/src/artifact.c b/src/artifact.c
index b7cc8b3dc..9537df732 100644
--- a/src/artifact.c
+++ b/src/artifact.c
@@ -169,7 +169,7 @@ mk_artifact(
             continue;
         if ((a->spfx & SPFX_NOGEN) || unique)
             continue;
-        if (a->gift_value > max_giftvalue)
+        if (a->gift_value > max_giftvalue && !Role_if(a->role))
             continue;
 
         if (!by_align) {
diff --git a/src/pray.c b/src/pray.c
index f9312daf2..c47e42f6d 100644
--- a/src/pray.c
+++ b/src/pray.c
@@ -1786,7 +1786,7 @@ bestow_artifact(uchar max_giftvalue)
         /* The player can gain an artifact */
         /* The chance goes down as the number of artifacts goes up */
         if (wizard)
-            do_bestow = y_n("Gift an artifact?");
+            do_bestow = y_n("Gift an artifact?") == 'y';
         else
             do_bestow = !rn2(6 + (2 * u.ugifts * nartifacts));
     }