diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index ea63670c6..1b678fda3 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -4,6 +4,7 @@ BtnDelete: Löschen
 BtnRegister: Anmelden
 BtnDeregister: Abmelden
 BtnHijack: Sitzung übernehmen
+BtnSave: Speichern
 
 Aborted: Abgebrochen
 Remarks: Hinweise
@@ -258,7 +259,7 @@ CloseAlert: Schliessen
 
 Name: Name
 MatrikelNr: Matrikelnummer
-NoMatrikelKnown: Keine Matrikelnummer eingetragen
+NoMatrikelKnown: Keine Matrikelnummer
 Theme: Oberflächen Design
 Favoriten: Anzahl gespeicherter Favoriten
 Plugin: Plugin
diff --git a/src/Handler/Course.hs b/src/Handler/Course.hs
index d5f42f523..01353c4b7 100644
--- a/src/Handler/Course.hs
+++ b/src/Handler/Course.hs
@@ -869,7 +869,7 @@ postCUserR tid ssh csh uCId = do
 
   ((noteRes, noteView), noteEnctype) <- runFormPost . identifyForm FIDcUserNote . renderAForm FormStandard $
       aopt (annotateField editByWgt htmlField') (fslpI MsgCourseUserNote "HTML" & setTooltip MsgCourseUserNoteTooltip) (Just noteText)
-      <*  submitButton
+      <*  saveButton
   formResult noteRes $ \mbNote -> (do
     now <- liftIO getCurrentTime
     case mbNote of
diff --git a/src/Handler/Utils/Form.hs b/src/Handler/Utils/Form.hs
index 1e40e4ffe..5b1a7fe04 100644
--- a/src/Handler/Utils/Form.hs
+++ b/src/Handler/Utils/Form.hs
@@ -45,9 +45,13 @@ import Utils.Lens
 import Data.Aeson (eitherDecodeStrict')
 import Data.Aeson.Text (encodeToLazyText)
 
+import Data.Proxy
+
 ----------------------------
 -- Buttons (new version ) --
 ----------------------------
+-- NOTE: ButtonSubmit is defined in Utils.Form !
+
 
 data ButtonDelete = BtnDelete
   deriving (Enum, Eq, Ord, Bounded, Read, Show, Generic, Typeable)
@@ -60,6 +64,23 @@ embedRenderMessage ''UniWorX ''ButtonDelete id
 instance Button UniWorX ButtonDelete where
   btnClasses BtnDelete = [BCIsButton, BCDanger]
 
+data ButtonSave = BtnSave
+  deriving (Enum, Eq, Ord, Bounded, Read, Show, Generic, Typeable)
+instance Universe ButtonSave
+instance Finite ButtonSave
+
+-- | Save-Button as AForm
+saveButton :: (Button (HandlerSite m) ButtonSave, MonadHandler m) => AForm m ()
+saveButton = combinedButtonFieldF_ (Proxy @ButtonSave) ""
+
+
+
+nullaryPathPiece ''ButtonSave $ camelToPathPiece' 1
+
+embedRenderMessage ''UniWorX ''ButtonSave id
+instance Button UniWorX ButtonSave where
+  btnClasses BtnSave = [BCIsButton, BCPrimary]
+
 data ButtonRegister = BtnRegister | BtnDeregister
   deriving (Enum, Eq, Ord, Bounded, Read, Show, Generic, Typeable)
 instance Universe ButtonRegister