diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/users/Update.java b/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/users/Update.java
index e7078edf9..032775f2b 100644
--- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/users/Update.java
+++ b/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/users/Update.java
@@ -22,7 +22,17 @@ import java.io.IOException;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import net.sourceforge.guacamole.GuacamoleException;
+import net.sourceforge.guacamole.net.auth.Directory;
+import net.sourceforge.guacamole.net.auth.User;
 import net.sourceforge.guacamole.net.auth.UserContext;
+import net.sourceforge.guacamole.net.auth.permission.ConnectionDirectoryPermission;
+import net.sourceforge.guacamole.net.auth.permission.ConnectionPermission;
+import net.sourceforge.guacamole.net.auth.permission.ObjectPermission;
+import net.sourceforge.guacamole.net.auth.permission.Permission;
+import net.sourceforge.guacamole.net.auth.permission.SystemPermission;
+import net.sourceforge.guacamole.net.auth.permission.UserDirectoryPermission;
+import net.sourceforge.guacamole.net.auth.permission.UserPermission;
 import net.sourceforge.guacamole.net.basic.AuthenticatingHttpServlet;
 
 /**
@@ -32,14 +42,151 @@ import net.sourceforge.guacamole.net.basic.AuthenticatingHttpServlet;
  */
 public class Update extends AuthenticatingHttpServlet {
 
+    /**
+     * String given for directory creation permission.
+     */
+    private static final String CREATE_PERMISSION = "create";
+    
+    /**
+     * Prefix given before an object identifier for read permission.
+     */
+    private static final String READ_PREFIX   = "read:";
+    
+    /**
+     * Prefix given before an object identifier for delete permission.
+     */
+    private static final String DELETE_PREFIX = "delete:";
+    
+    /**
+     * Prefix given before an object identifier for update permission.
+     */
+    private static final String UPDATE_PREFIX = "update:";
+    
+    /**
+     * Prefix given before an object identifier for administration permission.
+     */
+    private static final String ADMIN_PREFIX  = "admin:";
+
+    /**
+     * Given a permission string, returns the corresponding user permission.
+     * 
+     * @param str The permission string to parse.
+     * @return The parsed user permission.
+     * @throws GuacamoleException If the given string could not be parsed.
+     */
+    private Permission parseUserPermission(String str)
+            throws GuacamoleException {
+
+        // Create permission
+        if (str.equals(CREATE_PERMISSION))
+            return new UserDirectoryPermission(SystemPermission.Type.CREATE);
+        
+        // Read
+        if (str.startsWith(READ_PREFIX))
+            return new UserPermission(ObjectPermission.Type.READ,
+                    str.substring(READ_PREFIX.length()));
+        
+        // Update 
+        if (str.startsWith(UPDATE_PREFIX))
+            return new UserPermission(ObjectPermission.Type.UPDATE,
+                    str.substring(UPDATE_PREFIX.length()));
+
+        // Delete 
+        if (str.startsWith(DELETE_PREFIX))
+            return new UserPermission(ObjectPermission.Type.DELETE,
+                    str.substring(DELETE_PREFIX.length()));
+
+        // Administration
+        if (str.startsWith(ADMIN_PREFIX))
+            return new UserPermission(ObjectPermission.Type.ADMINISTER,
+                    str.substring(ADMIN_PREFIX.length()));
+        
+        throw new GuacamoleException("Invalid permission string.");
+        
+    }
+
+    /**
+     * Given a permission string, returns the corresponding connection
+     * permission.
+     * 
+     * @param str The permission string to parse.
+     * @return The parsed connection permission.
+     * @throws GuacamoleException If the given string could not be parsed.
+     */
+    private Permission parseConnectionPermission(String str)
+            throws GuacamoleException {
+
+        // Create permission
+        if (str.equals(CREATE_PERMISSION))
+            return new ConnectionDirectoryPermission(SystemPermission.Type.CREATE);
+        
+        // Read
+        if (str.startsWith(READ_PREFIX))
+            return new ConnectionPermission(ObjectPermission.Type.READ,
+                    str.substring(READ_PREFIX.length()));
+        
+        // Update 
+        if (str.startsWith(UPDATE_PREFIX))
+            return new ConnectionPermission(ObjectPermission.Type.UPDATE,
+                    str.substring(UPDATE_PREFIX.length()));
+
+        // Delete 
+        if (str.startsWith(DELETE_PREFIX))
+            return new ConnectionPermission(ObjectPermission.Type.DELETE,
+                    str.substring(DELETE_PREFIX.length()));
+
+        // Administration
+        if (str.startsWith(ADMIN_PREFIX))
+            return new ConnectionPermission(ObjectPermission.Type.ADMINISTER,
+                    str.substring(ADMIN_PREFIX.length()));
+        
+        throw new GuacamoleException("Invalid permission string.");
+        
+    }
+    
     @Override
     protected void authenticatedService(
             UserContext context,
             HttpServletRequest request, HttpServletResponse response)
     throws IOException, ServletException {
 
-        /* FIXME: STUB */
+        // Create user as specified
+        String username = request.getParameter("name");
+        String password = request.getParameter("password");
         
+        try {
+
+            // Attempt to get user directory
+            Directory<String, User> directory =
+                    context.getUserDirectory();
+
+            // Create user skeleton
+            User user = new DummyUser();
+            user.setUsername(username);
+            user.setPassword(password);
+            
+            // Set user permissions
+            String[] user_permission = request.getParameterValues("user");
+            if (user_permission != null) {
+                for (String str : user_permission)
+                    user.addPermission(parseUserPermission(str));
+            }
+
+            // Set connection permissions
+            String[] connection_permission = request.getParameterValues("connection");
+            if (connection_permission != null) {
+                for (String str : connection_permission)
+                    user.addPermission(parseConnectionPermission(str));
+            }
+            
+            // Update user
+            directory.update(user);
+            
+        }
+        catch (GuacamoleException e) {
+            throw new ServletException("Unable to update user.", e);
+        }
+ 
     }
 
 }