diff --git a/ccm-core/src/main/java/org/libreccm/admin/ui/LoginView.java b/ccm-core/src/main/java/org/libreccm/admin/ui/LoginView.java
index b1c066e89..8176fba3b 100644
--- a/ccm-core/src/main/java/org/libreccm/admin/ui/LoginView.java
+++ b/ccm-core/src/main/java/org/libreccm/admin/ui/LoginView.java
@@ -21,15 +21,12 @@ package org.libreccm.admin.ui;
 import com.arsdigita.kernel.KernelConfig;
 
 import com.vaadin.cdi.CDIView;
-import com.vaadin.event.Action;
-import com.vaadin.event.Action.Handler;
 import com.vaadin.event.ShortcutAction;
 import com.vaadin.navigator.View;
 import com.vaadin.navigator.ViewChangeListener;
 import com.vaadin.server.UserError;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.Button;
-import com.vaadin.ui.Component;
 import com.vaadin.ui.CustomComponent;
 import com.vaadin.ui.FormLayout;
 import com.vaadin.ui.Notification;
diff --git a/ccm-core/src/main/java/org/libreccm/admin/ui/usersgroupsroles/UserEditor.java b/ccm-core/src/main/java/org/libreccm/admin/ui/usersgroupsroles/UserEditor.java
index 0f0ede503..621f6eb89 100644
--- a/ccm-core/src/main/java/org/libreccm/admin/ui/usersgroupsroles/UserEditor.java
+++ b/ccm-core/src/main/java/org/libreccm/admin/ui/usersgroupsroles/UserEditor.java
@@ -18,10 +18,23 @@
  */
 package org.libreccm.admin.ui.usersgroupsroles;
 
-import com.vaadin.ui.Label;
+import com.vaadin.data.provider.AbstractDataProvider;
+import com.vaadin.data.provider.Query;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.FormLayout;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.PasswordField;
+import com.vaadin.ui.RadioButtonGroup;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.Window;
+import org.libreccm.core.UnexpectedErrorException;
 import org.libreccm.security.User;
 
+import java.util.Arrays;
+import java.util.stream.Stream;
+
 /**
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
@@ -29,17 +42,131 @@ import org.libreccm.security.User;
 public class UserEditor extends Window {
 
     private static final long serialVersionUID = 7024424532574023431L;
-    
-    private final User user;
-    
-    public UserEditor(final User user) {
-        
-        this.user = user;
-        
-        final Label label = new Label(String.format("Editor for user %s.",
-                                                    user.getName()));
-        setContent(label);
-        
+
+    private enum PasswordOptions {
+
+        GENERATE_AND_SEND,
+        SET
+
     }
-    
+
+    private final User user;
+
+    private TextField userName;
+    private TextField familyName;
+    private TextField givenName;
+    private TextField emailAddress;
+    private RadioButtonGroup<PasswordOptions> passwordOptions;
+    private PasswordField password;
+    private PasswordField passwordConfirmation;
+
+    public UserEditor() {
+        user = null;
+
+        addWidgets();
+    }
+
+    public UserEditor(final User user) {
+
+        this.user = user;
+
+        addWidgets();
+    }
+
+    private void addWidgets() {
+
+        userName = new TextField("User name");
+        userName.setRequiredIndicatorVisible(true);
+
+        familyName = new TextField("Family name");
+
+        givenName = new TextField("Given name");
+
+        emailAddress = new TextField("emailAddress");
+        emailAddress.setRequiredIndicatorVisible(true);
+
+        passwordOptions = new RadioButtonGroup<PasswordOptions>(
+            "Generate password or set manually?",
+            new AbstractDataProvider<PasswordOptions, String>() {
+
+            private static final long serialVersionUID = 1L;
+
+            @Override
+            public boolean isInMemory() {
+                return true;
+            }
+
+            @Override
+            public int size(final Query<PasswordOptions, String> query) {
+                return PasswordOptions.values().length;
+            }
+
+            @Override
+            public Stream<PasswordOptions> fetch(
+                final Query<PasswordOptions, String> query) {
+                return Arrays.stream(PasswordOptions.values());
+            }
+
+        });
+
+        password = new PasswordField("Password");
+        password.setRequiredIndicatorVisible(true);
+
+        passwordConfirmation = new PasswordField("Confirm password");
+        passwordConfirmation.setRequiredIndicatorVisible(true);
+
+        passwordOptions.addValueChangeListener(event -> {
+            switch (event.getValue()) {
+                case GENERATE_AND_SEND:
+                    password.setEnabled(false);
+                    password.setVisible(false);
+                    passwordConfirmation.setEnabled(false);
+                    passwordConfirmation.setVisible(false);
+                    break;
+                case SET:
+                    password.setEnabled(true);
+                    password.setVisible(true);
+                    passwordConfirmation.setEnabled(true);
+                    passwordConfirmation.setVisible(true);
+                    break;
+                default:
+                    throw new UnexpectedErrorException(String.format(
+                        "Unexpected value '%s' for password options.",
+                        event.getValue().toString()));
+            }
+        });
+
+        passwordOptions.setValue(PasswordOptions.GENERATE_AND_SEND);
+
+        final Button submit = new Button();
+        if (user == null) {
+            submit.setCaption("Create new user");
+        } else {
+            submit.setCaption("Save");
+        }
+
+        final Button cancel = new Button("Cancel");
+
+        final HorizontalLayout buttons = new HorizontalLayout(submit, cancel);
+        
+        final FormLayout formLayout = new FormLayout(userName,
+                                                     familyName,
+                                                     givenName,
+                                                     emailAddress,
+                                                     passwordOptions,
+                                                     password,
+                                                     passwordConfirmation);
+        
+        final VerticalLayout layout = new VerticalLayout(formLayout, buttons);
+
+        final Panel panel = new Panel(layout);
+        if (user == null) {
+            panel.setCaption("Create new user");
+        } else {
+            panel.setCaption("Edit user");
+        }
+
+        setContent(panel);
+    }
+
 }