diff --git a/src/Mod/TechDraw/App/DrawTemplate.cpp b/src/Mod/TechDraw/App/DrawTemplate.cpp
index 06deec094a..8964f10042 100644
--- a/src/Mod/TechDraw/App/DrawTemplate.cpp
+++ b/src/Mod/TechDraw/App/DrawTemplate.cpp
@@ -145,8 +145,11 @@ QString DrawTemplate::getAutofillValue(const QString &id) const
         QDateTime date = QDateTime::currentDateTime();
         return date.toString(QLocale().dateFormat(QLocale::ShortFormat));
     }
-    // organization
-    else if (id.compare(QString::fromUtf8(Autofill::Organization)) == 0) {
+    // organization ( also organisation/owner/company )
+    else if (id.compare(QString::fromUtf8(Autofill::Organization)) == 0 ||
+             id.compare(QString::fromUtf8(Autofill::Organisation)) == 0 ||
+             id.compare(QString::fromUtf8(Autofill::Owner)) == 0 ||
+             id.compare(QString::fromUtf8(Autofill::Company)) == 0 ) {
         auto value = QString::fromUtf8(doc->Company.getValue());
         if (!value.isEmpty()) {
             return value;
diff --git a/src/Mod/TechDraw/App/DrawTemplate.h b/src/Mod/TechDraw/App/DrawTemplate.h
index 66d8904e27..5178aeec26 100644
--- a/src/Mod/TechDraw/App/DrawTemplate.h
+++ b/src/Mod/TechDraw/App/DrawTemplate.h
@@ -74,6 +74,9 @@ public:
             static constexpr const char *Author       = "author";
             static constexpr const char *Date         = "date";
             static constexpr const char *Organization = "organization";
+            static constexpr const char *Organisation = "organisation";
+            static constexpr const char *Owner        = "owner";
+            static constexpr const char *Company      = "company";
             static constexpr const char *Scale        = "scale";
             static constexpr const char *Sheet        = "sheet";
             static constexpr const char *Title        = "title";