diff --git a/.classpath b/.classpath
index a5d9509..1a0c560 100644
--- a/.classpath
+++ b/.classpath
@@ -28,5 +28,11 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/pom.xml b/pom.xml
index ecf4beb..01fa149 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
 		<dependency>
 			<groupId>com.github.informatik-ag-ngl</groupId>
 			<artifactId>envoy-common</artifactId>
-			<version>develop-SNAPSHOT</version>
+			<version>e5c67b8</version>
 		</dependency>
 	</dependencies>
 
diff --git a/src/main/java/envoy/client/ui/LoginDialog.java b/src/main/java/envoy/client/ui/LoginDialog.java
index db88176..d81ecc1 100644
--- a/src/main/java/envoy/client/ui/LoginDialog.java
+++ b/src/main/java/envoy/client/ui/LoginDialog.java
@@ -1,7 +1,10 @@
 package envoy.client.ui;
 
 import java.awt.*;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
 import java.security.NoSuchAlgorithmException;
+import java.util.Arrays;
 
 import javax.swing.*;
 import javax.swing.border.EmptyBorder;
@@ -14,6 +17,7 @@ import envoy.data.LoginCredentials;
  * Created: <strong>01.01.2020</strong><br>
  * 
  * @author Kai S. K. Engelbart
+ * @author Maximilian K&auml;fer
  * @since Envoy v0.3-alpha
  */
 public class LoginDialog extends JDialog {
@@ -24,6 +28,11 @@ public class LoginDialog extends JDialog {
 	private JTextField			textField;
 	private JPasswordField		passwordField;
 
+	private JPasswordField		repeatPasswordField;
+	private JLabel				lblRepeatPassword;
+	private GridBagConstraints	gbc_lblRepeatPassword;
+	private GridBagConstraints	gbc_repeatPasswordField;
+
 	private LoginCredentials credentials;
 
 	/**
@@ -79,16 +88,78 @@ public class LoginDialog extends JDialog {
 			gbc_passwordField.gridy	= 1;
 			contentPanel.add(passwordField, gbc_passwordField);
 		}
+		{
+			lblRepeatPassword				= new JLabel("Repeat Password:");
+			gbc_lblRepeatPassword			= new GridBagConstraints();
+			gbc_lblRepeatPassword.anchor	= GridBagConstraints.EAST;
+			gbc_lblRepeatPassword.insets	= new Insets(0, 0, 0, 5);
+			gbc_lblRepeatPassword.gridx		= 0;
+			gbc_lblRepeatPassword.gridy		= 2;
+		}
+		{
+			repeatPasswordField = new JPasswordField();
+			gbc_repeatPasswordField			= new GridBagConstraints();
+			gbc_repeatPasswordField.fill	= GridBagConstraints.HORIZONTAL;
+			gbc_repeatPasswordField.gridx	= 1;
+			gbc_repeatPasswordField.gridy	= 2;
+		}
 		{
 			JPanel buttonPane = new JPanel();
+
+			JTextPane registerText = new JTextPane();
+			registerText.setText("Register?");
+			registerText.setFont(new Font("Arial", Font.BOLD, 12));
+			registerText.setAlignmentX(LEFT_ALIGNMENT);
+			buttonPane.add(registerText);
+
+			JCheckBox registerCheckBox = new JCheckBox();
+			registerCheckBox.setAlignmentX(LEFT_ALIGNMENT);
+			registerCheckBox.addItemListener(new ItemListener() {
+
+				@Override
+				public void itemStateChanged(ItemEvent e) {
+					switch (e.getStateChange()) {
+						case ItemEvent.SELECTED:
+							contentPanel.add(lblRepeatPassword, gbc_lblRepeatPassword);
+							contentPanel.add(repeatPasswordField, gbc_repeatPasswordField);
+							setSize(338, 160);
+							contentPanel.revalidate();
+							contentPanel.repaint();
+							break;
+
+						case ItemEvent.DESELECTED:
+							if (repeatPasswordField.getParent() == contentPanel) {
+								contentPanel.remove(lblRepeatPassword);
+								contentPanel.remove(repeatPasswordField);
+								setSize(338, 123);
+								contentPanel.revalidate();
+								contentPanel.repaint();
+							}
+							break;
+					}
+				}
+			});
+			buttonPane.add(registerCheckBox);
+
 			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
 			getContentPane().add(buttonPane, BorderLayout.SOUTH);
 			{
 				JButton okButton = new JButton("OK");
 				okButton.addActionListener((evt) -> {
 					try {
-						credentials = new LoginCredentials(textField.getText(), passwordField.getPassword());
-						dispose();
+						if (registerCheckBox.isSelected()) {
+							if (Arrays.equals(passwordField.getPassword(), repeatPasswordField.getPassword())) {
+								credentials = new LoginCredentials(textField.getText(), passwordField.getPassword(), true);
+								dispose();
+							} else {
+								JOptionPane.showMessageDialog(this, "The repeated password is unequal to the origional password!");
+								passwordField.setText(null);
+								repeatPasswordField.setText(null);
+							}
+						} else {
+							credentials = new LoginCredentials(textField.getText(), passwordField.getPassword(), false);
+							dispose();
+						}
 					} catch (NoSuchAlgorithmException e) {
 						e.printStackTrace();
 					}
diff --git a/src/main/java/envoy/client/ui/MessageListRenderer.java b/src/main/java/envoy/client/ui/MessageListRenderer.java
index 33f36f9..ed62854 100644
--- a/src/main/java/envoy/client/ui/MessageListRenderer.java
+++ b/src/main/java/envoy/client/ui/MessageListRenderer.java
@@ -41,7 +41,7 @@ public class MessageListRenderer extends JLabel implements ListCellRenderer<Mess
 
 		final String	text	= value.getText();
 		final String	state	= value.getStatus().toString();
-		final String	date	= new SimpleDateFormat("dd.MM.yyyy HH.mm").format(value.getDate());
+		final String	date	= new SimpleDateFormat("dd.MM.yyyy HH.mm").format(value.getCreationDate());
 
 		// Getting the MessageColor in the Chat of the current theme
 		String textColor = Settings.getInstance().getThemes().get(Settings.getInstance().getCurrentTheme()).getMessageColorChat().toHex();