diff --git a/src/modules/oemid/CMakeLists.txt b/src/modules/oemid/CMakeLists.txt
index be7c97c61..a2c807a60 100644
--- a/src/modules/oemid/CMakeLists.txt
+++ b/src/modules/oemid/CMakeLists.txt
@@ -3,6 +3,8 @@ calamares_add_plugin( oemid
     EXPORT_MACRO PLUGINDLLEXPORT_PRO
     SOURCES
         OEMViewStep.cpp
+    UI
+        OEMPage.ui
     LINK_PRIVATE_LIBRARIES
         calamaresui
         Qt5::Widgets
diff --git a/src/modules/oemid/OEMPage.ui b/src/modules/oemid/OEMPage.ui
new file mode 100644
index 000000000..d84984f0a
--- /dev/null
+++ b/src/modules/oemid/OEMPage.ui
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>OEMPage</class>
+ <widget class="QWidget" name="OEMPage">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <widget class="QWidget" name="gridLayoutWidget">
+   <property name="geometry">
+    <rect>
+     <x>-1</x>
+     <y>9</y>
+     <width>391</width>
+     <height>281</height>
+    </rect>
+   </property>
+   <layout class="QGridLayout" name="gridLayout">
+    <item row="0" column="1">
+     <widget class="QLineEdit" name="batchIdentifier">
+      <property name="toolTip">
+       <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter a batch-identifier here. This will be stored in the target system.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+      </property>
+     </widget>
+    </item>
+    <item row="0" column="0">
+     <widget class="QLabel" name="batchIdentifier_label">
+      <property name="text">
+       <string>Batch:</string>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/modules/oemid/OEMViewStep.cpp b/src/modules/oemid/OEMViewStep.cpp
index b91dceed9..7af97a3a3 100644
--- a/src/modules/oemid/OEMViewStep.cpp
+++ b/src/modules/oemid/OEMViewStep.cpp
@@ -18,10 +18,27 @@
 
 #include "OEMViewStep.h"
 
+#include "ui_OEMPage.h"
+
 #include "utils/Variant.h"
 
 #include <QDate>
 #include <QLabel>
+#include <QWidget>
+
+class OEMPage : public QWidget
+{
+public:
+    OEMPage()
+        : QWidget( nullptr )
+        , m_ui( new Ui_OEMPage() )
+    {
+        m_ui->setupUi( this );
+    }
+
+    Ui_OEMPage* m_ui;
+} ;
+
 
 OEMViewStep::OEMViewStep(QObject* parent)
     : Calamares::ViewStep( parent )
@@ -32,6 +49,8 @@ OEMViewStep::OEMViewStep(QObject* parent)
 
 OEMViewStep::~OEMViewStep()
 {
+    if ( m_widget && m_widget->parent() == nullptr )
+        m_widget->deleteLater();
 }
 
 bool OEMViewStep::isBackEnabled() const
@@ -68,17 +87,16 @@ static QString substitute( QString s )
 
 void OEMViewStep::onActivate()
 {
-    if ( !m_visited && m_user_batchIdentifier.isEmpty() )
-    {
-        m_user_batchIdentifier = substitute( m_conf_batchIdentifier );
-        // m_widget->setIdentifier( m_user_batchIdentifier );
-    }
+    if ( !m_widget )
+        (void) widget();
+    if ( !m_visited && m_widget )
+        m_widget->m_ui->batchIdentifier->setText( m_user_batchIdentifier );
     m_visited = true;
 }
 
 void OEMViewStep::onLeave()
 {
-    // m_user_batchIdentifier = m_widget->identifier();
+    m_user_batchIdentifier = m_widget->m_ui->batchIdentifier->text();
 }
 
 QString OEMViewStep::prettyName() const
@@ -88,7 +106,9 @@ QString OEMViewStep::prettyName() const
 
 QWidget * OEMViewStep::widget()
 {
-    return nullptr; // m_widget;
+    if (!m_widget)
+        m_widget = new OEMPage;
+    return m_widget;
 }
 
 Calamares::JobList OEMViewStep::jobs() const
@@ -99,6 +119,7 @@ Calamares::JobList OEMViewStep::jobs() const
 void OEMViewStep::setConfigurationMap(const QVariantMap& configurationMap)
 {
     m_conf_batchIdentifier = CalamaresUtils::getString( configurationMap, "batch-identifier" );
+    m_user_batchIdentifier = substitute( m_conf_batchIdentifier );
 }
 
 CALAMARES_PLUGIN_FACTORY_DEFINITION( OEMViewStepFactory, registerPlugin<OEMViewStep>(); )