diff --git a/scripts/tests/study.lua b/scripts/tests/study.lua
index 73dd8ecd3..8f4e17e17 100644
--- a/scripts/tests/study.lua
+++ b/scripts/tests/study.lua
@@ -8,7 +8,10 @@ end
 
 function setup()
     conf = [[{
-    "races" : { "human" : {} },
+    "races" : {
+        "human" : {},
+        "smurf" : { "flags" : [ "noteach" ] }
+    },
     "terrains" : { "plain" : { "flags" : [ "land" ] } },
     "keywords" : { "de" : {
         "autostudy": "LERNEN AUTO",
@@ -140,3 +143,14 @@ function test_auto_study_expensive()
     assert_equal(1, u:get_skill("tactics"))
     assert_equal("@LERNEN Taktik", u:get_order())
 end
+
+function test_auto_study_noteach()
+    local r = region.create(0, 0, "plain")
+    local f = faction.create("smurf")
+    local u = unit.create(f, r)
+    u:clear_orders()
+    u:add_order("@LERNE AUTO Armbrust")
+    process_orders()
+    assert_equal(1, u:get_skill("crossbow"))
+    assert_equal("@LERNEN Armbrust", u:get_order())
+end
diff --git a/src/automate.c b/src/automate.c
index 473dbdafd..2638e0a3e 100644
--- a/src/automate.c
+++ b/src/automate.c
@@ -26,7 +26,7 @@ static int cmp_scholars(const void *lhs, const void *rhs) {
     return (diff != 0) ? diff : b->u->number - a->u->number;
 }
 
-int autostudy_init(scholar scholars[], int max_scholars, unit **units, skill_t *o_skill)
+int autostudy_init(scholar scholars[], int max_scholars, unit **units, enum skill_t *o_skill)
 {
     unit *unext = NULL, *u = *units;
     faction *f = u->faction;
@@ -40,6 +40,7 @@ int autostudy_init(scholar scholars[], int max_scholars, unit **units, skill_t *
                     unext = u->next;
                     if (!can_teach(u)) {
                         cmistake(u, u->thisorder, 274, MSG_EVENT);
+                        set_keyword(u->thisorder, K_STUDY);
                         fset(u, UFL_MARK);
                     }
                     else if (long_order_allowed(u, false)) {
diff --git a/src/automate.test.c b/src/automate.test.c
index 280dbb22d..0104de66e 100644
--- a/src/automate.test.c
+++ b/src/automate.test.c
@@ -70,6 +70,26 @@ static void test_autostudy_init(CuTest *tc) {
     test_teardown();
 }
 
+static void test_autostudy_init_fallback(CuTest *tc) {
+    scholar scholar;
+    unit *u, *ulist;
+    faction *f;
+    region *r;
+    race *rc;
+    skill_t skill = NOSKILL;
+
+    test_setup();
+    rc = test_create_race("tunnelworm");
+    rc->flags |= RCF_NOTEACH;
+    r = test_create_plain(0, 0);
+    f = test_create_faction();
+    ulist = u = test_create_unit(f, r);
+    u_setrace(u, rc);
+    u->thisorder = create_order(K_AUTOSTUDY, f->locale, skillnames[SK_ENTERTAINMENT]);
+    CuAssertIntEquals(tc, 0, autostudy_init(&scholar, 1, &ulist, &skill));
+    CuAssertIntEquals(tc, K_STUDY, getkeyword(u->thisorder));
+}
+
 /**
  * Reproduce Bug 2520
  */
@@ -494,6 +514,7 @@ CuSuite *get_automate_suite(void)
 {
     CuSuite *suite = CuSuiteNew();
     SUITE_ADD_TEST(suite, test_autostudy_init);
+    SUITE_ADD_TEST(suite, test_autostudy_init_fallback);
     SUITE_ADD_TEST(suite, test_autostudy_run);
     SUITE_ADD_TEST(suite, test_do_autostudy);
     SUITE_ADD_TEST(suite, test_autostudy_batches);
diff --git a/src/kernel/order.c b/src/kernel/order.c
index 72a309c2a..f46edfc6f 100644
--- a/src/kernel/order.c
+++ b/src/kernel/order.c
@@ -26,6 +26,7 @@
 #include <string.h>
 
 # define ORD_KEYWORD(ord) (keyword_t)((ord)->command & 0xFFFF)
+# define ORD_FLAGS(ord) ((ord)->command & 0xFFFF0000)
 # define OD_STRING(odata) ((odata) ? (odata)->_str : NULL)
 
 order_data *odata_load(int id)
@@ -101,6 +102,12 @@ keyword_t getkeyword(const order * ord)
     return ORD_KEYWORD(ord);
 }
 
+void set_keyword(order *ord, keyword_t kwd)
+{
+    int flags = ORD_FLAGS(ord);
+    ord->command = flags | (int)kwd;
+}
+
 /** returns a plain-text representation of the order.
  * This is the inverse function to the parse_order command. Note that
  * keywords are expanded to their full length.
diff --git a/src/kernel/order.h b/src/kernel/order.h
index db63eb8af..4166d5e0d 100644
--- a/src/kernel/order.h
+++ b/src/kernel/order.h
@@ -60,6 +60,7 @@ extern "C" {
 
     /* access functions for orders */
     keyword_t getkeyword(const order * ord);
+    void set_keyword(order *ord, keyword_t kwd);
     void set_order(order ** destp, order * src);
     char* get_command(const order *ord, const struct locale *lang,
         char *buffer, size_t size);
diff --git a/src/kernel/order.test.c b/src/kernel/order.test.c
index cd095b749..798443323 100644
--- a/src/kernel/order.test.c
+++ b/src/kernel/order.test.c
@@ -175,6 +175,39 @@ static void test_parse_autostudy(CuTest *tc) {
     test_teardown();
 }
 
+static void test_set_keyword(CuTest *tc) {
+    order *ord;
+    struct locale * lang;
+
+    test_setup();
+    lang = get_or_create_locale("en");
+    locale_setstring(lang, mkname("skill", skillnames[SK_ENTERTAINMENT]), "Entertainment");
+    locale_setstring(lang, keyword(K_STUDY), "STUDY");
+    locale_setstring(lang, keyword(K_AUTOSTUDY), "AUTOSTUDY");
+    locale_setstring(lang, param_name(P_AUTO, NULL), "AUTO");
+    init_locale(lang);
+
+    ord = parse_order("STUDY AUTO Entertainment", lang);
+    CuAssertIntEquals(tc, K_AUTOSTUDY, getkeyword(ord));
+    set_keyword(ord, K_STUDY);
+    CuAssertIntEquals(tc, K_STUDY, getkeyword(ord));
+    free_order(ord);
+
+    ord = parse_order("!@STUDY AUTO Entertainment", lang);
+    CuAssertTrue(tc, is_persistent(ord));
+    CuAssertTrue(tc, is_silent(ord));
+    CuAssertIntEquals(tc, K_AUTOSTUDY, getkeyword(ord));
+    CuAssertIntEquals(tc, CMD_PERSIST|CMD_QUIET, ord->command & (CMD_PERSIST | CMD_QUIET));
+    set_keyword(ord, K_STUDY);
+    CuAssertIntEquals(tc, K_STUDY, getkeyword(ord));
+    CuAssertTrue(tc, is_persistent(ord));
+    CuAssertTrue(tc, is_silent(ord));
+    CuAssertIntEquals(tc, CMD_PERSIST | CMD_QUIET, ord->command & (CMD_PERSIST | CMD_QUIET));
+    free_order(ord);
+
+    test_teardown();
+}
+
 static void test_parse_make_temp(CuTest *tc) {
     char cmd[32];
     order *ord;
@@ -613,6 +646,7 @@ CuSuite *get_order_suite(void)
     SUITE_ADD_TEST(suite, test_parse_parameters);
     SUITE_ADD_TEST(suite, test_parse_make);
     SUITE_ADD_TEST(suite, test_parse_autostudy);
+    SUITE_ADD_TEST(suite, test_set_keyword);
     SUITE_ADD_TEST(suite, test_parse_make_temp);
     SUITE_ADD_TEST(suite, test_parse_maketemp);
     SUITE_ADD_TEST(suite, test_init_order);
diff --git a/tests/data/test.dat b/tests/data/test.dat
deleted file mode 100644
index f06761f12..000000000
Binary files a/tests/data/test.dat and /dev/null differ