diff --git a/npc/pre-re/jobs/1-1/mage.txt b/npc/pre-re/jobs/1-1/mage.txt
index 97e1fccd01..7ac47e4920 100644
--- a/npc/pre-re/jobs/1-1/mage.txt
+++ b/npc/pre-re/jobs/1-1/mage.txt
@@ -207,17 +207,9 @@ geffen_in,164,124,4	script	Mage Guildsman	123,{
 		mes "Congratulations!";
 		mes "You are now a Mage!";
 		next;
-		if(checkquest(1005) != -1) {
-			completequest 1005;
-		}
-		else if(checkquest(1006) != -1) {
-			completequest 1006;
-		}
-		else if(checkquest(1007) != -1) {
-			completequest 1007;
-		}
-		else {
-			completequest 1008;
+		for ( .@quest_id = 1005; .@quest_id <= 1008; .@quest_id++ ) {
+			if (isbegin_quest(.@quest_id) == 1)
+				completequest .@quest_id;
 		}
 		callfunc "Job_Change",Job_Mage;
 		callfunc "F_ClearJobVar";
diff --git a/npc/pre-re/jobs/1-1/merchant.txt b/npc/pre-re/jobs/1-1/merchant.txt
index 3a4d84c0b6..3db83bdf66 100644
--- a/npc/pre-re/jobs/1-1/merchant.txt
+++ b/npc/pre-re/jobs/1-1/merchant.txt
@@ -154,17 +154,9 @@ alberta_in,53,43,6	script	Merchant#mer	86,{
 		mes "Congratulations!";
 		callfunc "Job_Change",Job_Merchant;
 		callfunc "F_ClearJobVar";
-		if(checkquest(1009) != -1) {
-			completequest 1009;
-		}
-		else if(checkquest(1010) != -1) {
-			completequest 1010;
-		}
-		else if(checkquest(1011) != -1) {
-			completequest 1011;
-		}
-		else {
-			completequest 1012;
+		for ( .@quest_id = 1009; .@quest_id <= 1012; .@quest_id++ ) {
+			if (isbegin_quest(.@quest_id) == 1)
+				completequest .@quest_id;
 		}
 		mes "I'm very pleased that you are joining the Merchant Guild and hope that you will play an active part in Rune-Midgarts' economy.";
 		next;