diff --git a/README.md b/README.md
index 89c47f2..3bdaf5b 100644
--- a/README.md
+++ b/README.md
@@ -2,10 +2,10 @@
 This App generates a XML file from a CSV or Excel file as input. The XML file can then be imported into the [ILIAS e-Learning System](http://www.ilias.de/).
 
 ## Download Latest Release
-  * [2.0.3](https://github.com/iFadi/ilias-userimport/releases/download/2.0.3/IUI_2.0.3.jar)
+  * [2.0.4](https://github.com/iFadi/ilias-userimport/releases/download/2.0.4/IUI_2.0.4.jar)
 
 ## What is it for?
-This tool is used to convert a massive number of users from a (CSV, Excel) file to a XML file that can be imported in the [ILIAS e-Learning System](http://www.ilias.de/), originally this tool was developed to simplify the import of users to a separate ILIAS installation which is used only for the purpose of eExams(eKlausuren) and has specific local roles, here is a list of features which this tool can apply to the imported users list:
+This tool is used to convert a massive number of users from a (CSV, Excel) file to a XML file that can be imported in the [ILIAS e-Learning System](http://www.ilias.de/), it is also able to generate massive test accounts. Originally this tool was developed to simplify the import of users to a separate ILIAS installation which is used only for the purpose of eExams(eKlausuren) and has specific local roles, here is a list of features which this tool can apply to the imported users list:
 * Set a generated or united password to all users.
 * Set a Global/Local Role.
 * Set Limited Access. (i.e. only on the day of the exam)
@@ -22,11 +22,11 @@ This tool is used to convert a massive number of users from a (CSV, Excel) file
 * Windows, Mac, or Linux OS
 * Java SE 11.0.2
 
-Note: The Release was tested with Java SE 11.0.2, it might not work with other Java Versions.
+Note: The Release was tested with Java SE 11.0.2, it might or might not work with other Java Versions.
 
 ## Donation
 
-If you find this tool useful you can buy me a Coffee [<img src="https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif">](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=fadi_asbih%40yahoo%2ede&lc=US&item_name=Support%20Developing%20ILIAS%20User%20Import&no_note=0&currency_code=EUR&bn=PP%2dDonationsBF%3abtn_donate_LG%2egif%3aNonHostedGuest)
+If you find this tool useful or need a fast bug fix you can buy me a Coffee :coffee: to get started :nerd_face: [<img src="https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif">](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=fadi_asbih%40yahoo%2ede&lc=US&item_name=Support%20Developing%20ILIAS%20User%20Import&no_note=0&currency_code=EUR&bn=PP%2dDonationsBF%3abtn_donate_LG%2egif%3aNonHostedGuest)
  
 
 ## Legal
diff --git a/resources/version.html b/resources/version.html
index 9d507ab..4face83 100644
--- a/resources/version.html
+++ b/resources/version.html
@@ -1,3 +1,3 @@
 [major]2[/major]
 [minor]0[/minor]
-[patch]3[/patch]
+[patch]4[/patch]
diff --git a/src/de/unihannover/elsa/iui/view/DummyAccountsDialog.fxml b/src/de/unihannover/elsa/iui/view/DummyAccountsDialog.fxml
index 345d187..f696f2b 100644
--- a/src/de/unihannover/elsa/iui/view/DummyAccountsDialog.fxml
+++ b/src/de/unihannover/elsa/iui/view/DummyAccountsDialog.fxml
@@ -9,7 +9,7 @@
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.layout.AnchorPane?>
 
-<AnchorPane prefHeight="391.0" prefWidth="511.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.unihannover.elsa.iui.view.DummyAccountsDialogController">
+<AnchorPane prefHeight="414.0" prefWidth="519.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.unihannover.elsa.iui.view.DummyAccountsDialogController">
    <children>
       <GridPane layoutX="14.0" layoutY="141.0" prefHeight="70.0" prefWidth="345.0" AnchorPane.bottomAnchor="180.0" AnchorPane.leftAnchor="14.0" AnchorPane.rightAnchor="40.0">
         <columnConstraints>
@@ -27,11 +27,11 @@
             <TextField fx:id="localRoleField" text="klausur_am_04.02.2015" GridPane.columnIndex="1" GridPane.rowIndex="1" />
          </children>
       </GridPane>
-      <Label layoutX="14.0" layoutY="14.0" prefHeight="26.0" prefWidth="374.0" text="You can here generate dummy accounts" AnchorPane.leftAnchor="14.0" AnchorPane.topAnchor="14.0">
+      <Label layoutX="14.0" layoutY="7.0" prefHeight="26.0" prefWidth="374.0" text="You can here generate dummy accounts" AnchorPane.leftAnchor="14.0" AnchorPane.topAnchor="7.0">
          <font>
             <Font name="System Bold" size="13.0" />
          </font></Label>
-      <HBox layoutX="287.0" layoutY="350.0">
+      <HBox layoutX="270.0" layoutY="370.0" prefHeight="27.0" prefWidth="232.0">
          <children>
             <Button defaultButton="true" layoutX="266.0" layoutY="154.0" mnemonicParsing="false" onAction="#handleGenerate" prefHeight="27.0" prefWidth="120.0" text="Generate">
                <HBox.margin>
@@ -45,7 +45,7 @@
             </Button>
          </children>
       </HBox>
-      <GridPane layoutX="14.0" layoutY="261.0" prefHeight="70.0" prefWidth="345.0" AnchorPane.leftAnchor="14.0" AnchorPane.rightAnchor="40.0">
+      <GridPane layoutX="14.0" layoutY="280.0" prefHeight="70.0" prefWidth="345.0" AnchorPane.leftAnchor="14.0" AnchorPane.rightAnchor="40.0">
          <columnConstraints>
             <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
             <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
@@ -61,10 +61,10 @@
             <TextField fx:id="timeLimitUntilField" disable="true" text="05-02-2015" GridPane.columnIndex="1" GridPane.rowIndex="1" />
          </children>
       </GridPane>
-      <ToggleButton fx:id="limitedButton" layoutX="14.0" layoutY="234.0" mnemonicParsing="false" text="Limited Access" />
-      <Separator layoutY="127.0" prefHeight="5.0" prefWidth="517.0" />
-      <Separator layoutY="223.0" prefHeight="5.0" prefWidth="517.0" />
-      <GridPane layoutX="14.0" layoutY="40.0" prefHeight="81.0" prefWidth="480.0" AnchorPane.leftAnchor="14.0" AnchorPane.rightAnchor="40.0">
+      <ToggleButton fx:id="limitedButton" layoutX="14.0" layoutY="250.0" mnemonicParsing="false" text="Limited Access" />
+      <Separator layoutY="162.0" prefHeight="5.0" prefWidth="517.0" />
+      <Separator layoutY="232.0" prefHeight="5.0" prefWidth="517.0" />
+      <GridPane layoutX="14.0" layoutY="40.0" AnchorPane.leftAnchor="14.0" AnchorPane.rightAnchor="40.0">
         <columnConstraints>
           <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
           <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
@@ -73,6 +73,7 @@
           <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
           <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
           <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
         </rowConstraints>
          <children>
             <Label text="Number of accounts" />
@@ -81,9 +82,11 @@
                   <Tooltip text="i.e. &quot;test&quot; will generate test_1, test_2,... " />
                </tooltip></Label>
             <Label text="Password" GridPane.rowIndex="2" />
+            <Label text="Email" GridPane.rowIndex="3" />
             <TextField fx:id="numberOfAccountsField" text="10" GridPane.columnIndex="1" />
-            <TextField fx:id="loginPrefixField" text="ersatz" GridPane.columnIndex="1" GridPane.rowIndex="1" />
-            <TextField fx:id="passwordField" text="password" GridPane.columnIndex="1" GridPane.rowIndex="2" />
+            <TextField fx:id="loginPrefixField" text="test" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+            <TextField fx:id="passwordField" text="testing" GridPane.columnIndex="1" GridPane.rowIndex="2" />
+            <TextField fx:id="emailField" text="email@domain.de" GridPane.columnIndex="1" GridPane.rowIndex="3" />
          </children>
       </GridPane>
    </children>
diff --git a/src/de/unihannover/elsa/iui/view/DummyAccountsDialogController.java b/src/de/unihannover/elsa/iui/view/DummyAccountsDialogController.java
index 1345752..adecaee 100644
--- a/src/de/unihannover/elsa/iui/view/DummyAccountsDialogController.java
+++ b/src/de/unihannover/elsa/iui/view/DummyAccountsDialogController.java
@@ -40,6 +40,8 @@ public class DummyAccountsDialogController {
     private TextField loginPrefixField;
     @FXML
     private TextField passwordField;
+    @FXML
+    private TextField emailField;
 	@FXML
     private TextField globalRoleField;
     @FXML
@@ -139,7 +141,7 @@ private void handleGenerate() throws NoSuchAlgorithmException {
 			dummyAccount.getLocalRole().setId(localRoleField.getText());
 			dummyAccount.setFirstName("Ersatz Account");
 			dummyAccount.setLastName(i+"");
-			dummyAccount.setEmail("ersatz@account.de");
+			dummyAccount.setEmail(emailField.getText());
 			dummyAccount.setMatriculation("123456");
 			dummyAccount.setLogin(loginPrefixField.getText()+"_"+i);
 			dummyAccount.setPassword(new Password(passwordField.getText()));
diff --git a/src/de/unihannover/elsa/iui/view/RootLayout.fxml b/src/de/unihannover/elsa/iui/view/RootLayout.fxml
index 7450543..67d3df7 100644
--- a/src/de/unihannover/elsa/iui/view/RootLayout.fxml
+++ b/src/de/unihannover/elsa/iui/view/RootLayout.fxml
@@ -36,7 +36,7 @@
           <Menu mnemonicParsing="false" text="Edit">
             <items>
               <MenuItem mnemonicParsing="false" onAction="#handleSettings" text="Settings" />
-                  <MenuItem mnemonicParsing="false" onAction="#handleDummyAccounts" text="Generate dummy accounts" />
+                  <MenuItem mnemonicParsing="false" onAction="#handleDummyAccounts" text="Generate test accounts" />
             </items>
           </Menu>
           <Menu mnemonicParsing="false" text="Help">