diff --git a/core/js/singleselect.js b/core/js/singleselect.js
new file mode 100644
index 0000000000..1a018b7414
--- /dev/null
+++ b/core/js/singleselect.js
@@ -0,0 +1,76 @@
+(function ($) {
+	$.fn.singleSelect = function () {
+		return this.each(function (i, select) {
+			var input = $('<input/>');
+			select = $(select);
+			input.css('position', 'absolute');
+			input.css(select.offset());
+			input.css({
+				'box-sizing': 'border-box',
+				'-moz-box-sizing': 'border-box',
+				'margin': 0,
+				'width': (select.width() - 5) + 'px',
+				'height': (select.outerHeight() - 2) + 'px',
+				'border': 'none',
+				'box-shadow': 'none',
+				'margin-top': '1px',
+				'margin-left': '1px',
+				'z-index': 1000
+			});
+			input.hide();
+			$('body').append(input);
+
+			select.on('change', function (event) {
+				var value = $(this).val(),
+					newAttr = $('option:selected', $(this)).attr('data-new');
+				if (!(typeof newAttr !== 'undefined' && newAttr !== false)) {
+					input.hide();
+					select.data('previous', value);
+				} else {
+					event.stopImmediatePropagation();
+					input.show();
+					select.css('background-color', 'white');
+					input.focus();
+				}
+			});
+
+			$(select).data('previous', $(select).val());
+
+			input.on('change', function () {
+				var value = $(this).val();
+				if (value) {
+					select.children().attr('selected', null);
+					var existingOption = select.children().filter(function (i, option) {
+						return ($(option).val() == value);
+					});
+					if (existingOption.length) {
+						existingOption.attr('selected', 'selected');
+					} else {
+						var option = $('<option/>');
+						option.attr('selected', 'selected').attr('value', value).text(value);
+						select.children().last().before(option);
+					}
+					select.val(value);
+					select.css('background-color', null);
+					input.val(null);
+					input.hide();
+					select.change();
+				} else {
+					var previous = select.data('previous');
+					select.children().attr('selected', null);
+					select.children().each(function (i, option) {
+						if ($(option).val() == previous) {
+							$(option).attr('selected', 'selected');
+						}
+					});
+					select.removeClass('active');
+					input.hide();
+				}
+			});
+
+			input.on('blur', function () {
+				$(this).change();
+			});
+		});
+	}
+})(jQuery);
diff --git a/settings/css/settings.css b/settings/css/settings.css
index 9dd17daaeb..56a2b6b251 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -39,7 +39,6 @@ div.quota { float:right; display:block; position:absolute; right:25em; top:0; }
 div.quota-select-wrapper { position: relative; }
 select.quota { position:absolute; left:0; top:0.5em; width:10em; }
 select.quota-user { position:relative; left:0; top:0; width:10em; }
-input.quota-other { display:none; position:absolute; left:0.1em; top:0.1em; width:7em; border:none; box-shadow:none; }
 div.quota>span { position:absolute; right:0; white-space:nowrap; top:.7em; color:#888; text-shadow:0 1px 0 #fff; }
 select.quota.active { background: #fff; }
 
diff --git a/settings/js/users.js b/settings/js/users.js
index 094cddda29..8b1e32163d 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -5,449 +5,395 @@
  */
 
 var UserList = {
-    useUndo:true,
+	useUndo: true,
 
-    /**
-     * @brief Initiate user deletion process in UI
-     * @param string uid the user ID to be deleted
-     *
-     * Does not actually delete the user; it sets them for
-     * deletion when the current page is unloaded, at which point
-     * finishDelete() completes the process. This allows for 'undo'.
-     */
-    do_delete:function (uid) {
-        if (typeof UserList.deleteUid !== 'undefined') {
-            //Already a user in the undo queue
-            UserList.finishDelete(null);
-        }
-        UserList.deleteUid = uid;
+	/**
+	 * @brief Initiate user deletion process in UI
+	 * @param string uid the user ID to be deleted
+	 *
+	 * Does not actually delete the user; it sets them for
+	 * deletion when the current page is unloaded, at which point
+	 * finishDelete() completes the process. This allows for 'undo'.
+	 */
+	do_delete: function (uid) {
+		if (typeof UserList.deleteUid !== 'undefined') {
+			//Already a user in the undo queue
+			UserList.finishDelete(null);
+		}
+		UserList.deleteUid = uid;
 
-        // Set undo flag
-        UserList.deleteCanceled = false;
+		// Set undo flag
+		UserList.deleteCanceled = false;
 
-        // Provide user with option to undo
-        $('#notification').data('deleteuser', true);
-        OC.Notification.showHtml(t('users', 'deleted') + ' ' + uid + '<span class="undo">' + t('users', 'undo') + '</span>');
-    },
+		// Provide user with option to undo
+		$('#notification').data('deleteuser', true);
+		OC.Notification.showHtml(t('users', 'deleted') + ' ' + uid + '<span class="undo">' + t('users', 'undo') + '</span>');
+	},
 
-    /**
-     * @brief Delete a user via ajax
-     * @param bool ready whether to use ready() upon completion
-     *
-     * Executes deletion via ajax of user identified by property deleteUid
-     * if 'undo' has not been used.  Completes the user deletion procedure
-     * and reflects success in UI.
-     */
-    finishDelete:function (ready) {
+	/**
+	 * @brief Delete a user via ajax
+	 * @param bool ready whether to use ready() upon completion
+	 *
+	 * Executes deletion via ajax of user identified by property deleteUid
+	 * if 'undo' has not been used.  Completes the user deletion procedure
+	 * and reflects success in UI.
+	 */
+	finishDelete: function (ready) {
 
-        // Check deletion has not been undone
-        if (!UserList.deleteCanceled && UserList.deleteUid) {
+		// Check deletion has not been undone
+		if (!UserList.deleteCanceled && UserList.deleteUid) {
 
-            // Delete user via ajax
-            $.ajax({
-                type:'POST',
-                url:OC.filePath('settings', 'ajax', 'removeuser.php'),
-                async:false,
-                data:{ username:UserList.deleteUid },
-                success:function (result) {
-                    if (result.status == 'success') {
-                        // Remove undo option, & remove user from table
-                        OC.Notification.hide();
-                        $('tr').filterAttr('data-uid', UserList.deleteUid).remove();
-                        UserList.deleteCanceled = true;
-                        if (ready) {
-                            ready();
-                        }
-                    } else {
-                        oc.dialogs.alert(result.data.message, t('settings', 'Unable to remove user'));
-                    }
-                }
-            });
-        }
-    },
+			// Delete user via ajax
+			$.ajax({
+				type: 'POST',
+				url: OC.filePath('settings', 'ajax', 'removeuser.php'),
+				async: false,
+				data: { username: UserList.deleteUid },
+				success: function (result) {
+					if (result.status == 'success') {
+						// Remove undo option, & remove user from table
+						OC.Notification.hide();
+						$('tr').filterAttr('data-uid', UserList.deleteUid).remove();
+						UserList.deleteCanceled = true;
+						if (ready) {
+							ready();
+						}
+					} else {
+						oc.dialogs.alert(result.data.message, t('settings', 'Unable to remove user'));
+					}
+				}
+			});
+		}
+	},
 
-    add:function (username, groups, subadmin, quota, sort) {
-        var tr = $('tbody tr').first().clone();
-        tr.attr('data-uid', username);
-        tr.attr('data-displayName', username);
-        tr.find('td.name').text(username);
-        tr.find('td.displayName').text(username);
-        var groupsSelect = $('<select multiple="multiple" class="groupsselect" data-placehoder="Groups" title="' + t('settings', 'Groups') + '"></select>').attr('data-username', username).attr('data-user-groups', groups);
-        tr.find('td.groups').empty();
-        if (tr.find('td.subadmins').length > 0) {
-            var subadminSelect = $('<select multiple="multiple" class="subadminsselect" data-placehoder="subadmins" title="' + t('settings', 'Group Admin') + '">').attr('data-username', username).attr('data-user-groups', groups).attr('data-subadmin', subadmin);
-            tr.find('td.subadmins').empty();
-        }
-        var allGroups = String($('#content table').attr('data-groups')).split(', ');
-        $.each(allGroups, function (i, group) {
-            groupsSelect.append($('<option value="' + group + '">' + group + '</option>'));
-            if (typeof subadminSelect !== 'undefined' && group != 'admin') {
-                subadminSelect.append($('<option value="' + group + '">' + group + '</option>'));
-            }
-        });
-        tr.find('td.groups').append(groupsSelect);
-        UserList.applyMultiplySelect(groupsSelect);
-        if (tr.find('td.subadmins').length > 0) {
-            tr.find('td.subadmins').append(subadminSelect);
-            UserList.applyMultiplySelect(subadminSelect);
-        }
-        if (tr.find('td.remove img').length == 0 && OC.currentUser != username) {
-            var rm_img = $('<img>', {
-                class:'svg action',
-                src:OC.imagePath('core', 'actions/delete')
-            });
-            var rm_link = $('<a>', { class:'action delete', href:'#', 'original-title':t('settings', 'Delete')}).append(rm_img);
-            tr.find('td.remove').append(rm_link);
-        } else if (OC.currentUser == username) {
-            tr.find('td.remove a').remove();
-        }
-        var quotaSelect = tr.find('select.quota-user');
-        if (quota == 'default') {
-            quotaSelect.find('option').attr('selected', null);
-            quotaSelect.find('option').first().attr('selected', 'selected');
-            quotaSelect.data('previous', 'default');
-        } else {
-            if (quotaSelect.find('option[value="' + quota + '"]').length > 0) {
-                quotaSelect.find('option[value="' + quota + '"]').attr('selected', 'selected');
-            } else {
-                quotaSelect.append('<option value="' + quota + '" selected="selected">' + quota + '</option>');
-            }
-        }
-        var added = false;
-        if (sort) {
-            username = username.toLowerCase();
-            $('tbody tr').each(function () {
-                if (username < $(this).attr('data-uid').toLowerCase()) {
-                    $(tr).insertBefore($(this));
-                    added = true;
-                    return false;
-                }
-            });
-        }
-        if (!added) {
-            $(tr).appendTo('tbody');
-        }
-        return tr;
-    },
+	add: function (username, groups, subadmin, quota, sort) {
+		var tr = $('tbody tr').first().clone();
+		tr.attr('data-uid', username);
+		tr.attr('data-displayName', username);
+		tr.find('td.name').text(username);
+		tr.find('td.displayName').text(username);
+		var groupsSelect = $('<select multiple="multiple" class="groupsselect" data-placehoder="Groups" title="' + t('settings', 'Groups') + '"></select>').attr('data-username', username).attr('data-user-groups', groups);
+		tr.find('td.groups').empty();
+		if (tr.find('td.subadmins').length > 0) {
+			var subadminSelect = $('<select multiple="multiple" class="subadminsselect" data-placehoder="subadmins" title="' + t('settings', 'Group Admin') + '">').attr('data-username', username).attr('data-user-groups', groups).attr('data-subadmin', subadmin);
+			tr.find('td.subadmins').empty();
+		}
+		var allGroups = String($('#content table').attr('data-groups')).split(', ');
+		$.each(allGroups, function (i, group) {
+			groupsSelect.append($('<option value="' + group + '">' + group + '</option>'));
+			if (typeof subadminSelect !== 'undefined' && group != 'admin') {
+				subadminSelect.append($('<option value="' + group + '">' + group + '</option>'));
+			}
+		});
+		tr.find('td.groups').append(groupsSelect);
+		UserList.applyMultiplySelect(groupsSelect);
+		if (tr.find('td.subadmins').length > 0) {
+			tr.find('td.subadmins').append(subadminSelect);
+			UserList.applyMultiplySelect(subadminSelect);
+		}
+		if (tr.find('td.remove img').length == 0 && OC.currentUser != username) {
+			var rm_img = $('<img>', {
+				class: 'svg action',
+				src: OC.imagePath('core', 'actions/delete')
+			});
+			var rm_link = $('<a>', { class: 'action delete', href: '#', 'original-title': t('settings', 'Delete')}).append(rm_img);
+			tr.find('td.remove').append(rm_link);
+		} else if (OC.currentUser == username) {
+			tr.find('td.remove a').remove();
+		}
+		var quotaSelect = tr.find('select.quota-user');
+		if (quota == 'default') {
+			quotaSelect.find('option').attr('selected', null);
+			quotaSelect.find('option').first().attr('selected', 'selected');
+			quotaSelect.data('previous', 'default');
+		} else {
+			if (quotaSelect.find('option[value="' + quota + '"]').length > 0) {
+				quotaSelect.find('option[value="' + quota + '"]').attr('selected', 'selected');
+			} else {
+				quotaSelect.append('<option value="' + quota + '" selected="selected">' + quota + '</option>');
+			}
+		}
+		var added = false;
+		if (sort) {
+			username = username.toLowerCase();
+			$('tbody tr').each(function () {
+				if (username < $(this).attr('data-uid').toLowerCase()) {
+					$(tr).insertBefore($(this));
+					added = true;
+					return false;
+				}
+			});
+		}
+		if (!added) {
+			$(tr).appendTo('tbody');
+		}
+		return tr;
+	},
 
-    update:function () {
-        if (typeof UserList.offset === 'undefined') {
-            UserList.offset = $('tbody tr').length;
-        }
-        $.get(OC.Router.generate('settings_ajax_userlist', { offset:UserList.offset }), function (result) {
-            if (result.status === 'success') {
-                $.each(result.data, function (index, user) {
-                    var tr = UserList.add(user.name, user.groups, user.subadmin, user.quota, false);
-                    UserList.offset++;
-                    if (index == 9) {
-                        $(tr).bind('inview', function (event, isInView, visiblePartX, visiblePartY) {
-                            $(this).unbind(event);
-                            UserList.update();
-                        });
-                    }
-                });
-            }
-        });
-    },
+	update: function () {
+		if (typeof UserList.offset === 'undefined') {
+			UserList.offset = $('tbody tr').length;
+		}
+		$.get(OC.Router.generate('settings_ajax_userlist', { offset: UserList.offset }), function (result) {
+			if (result.status === 'success') {
+				$.each(result.data, function (index, user) {
+					var tr = UserList.add(user.name, user.groups, user.subadmin, user.quota, false);
+					UserList.offset++;
+					if (index == 9) {
+						$(tr).bind('inview', function (event, isInView, visiblePartX, visiblePartY) {
+							$(this).unbind(event);
+							UserList.update();
+						});
+					}
+				});
+			}
+		});
+	},
 
-    applyMultiplySelect:function (element) {
-        var checked = [];
-        var user = element.attr('data-username');
-        if ($(element).attr('class') == 'groupsselect') {
-            if (element.data('userGroups')) {
-                checked = String(element.data('userGroups')).split(', ');
-            }
-            if (user) {
-                var checkHandeler = function (group) {
-                    if (user == OC.currentUser && group == 'admin') {
-                        return false;
-                    }
-                    if (!isadmin && checked.length == 1 && checked[0] == group) {
-                        return false;
-                    }
-                    $.post(
-                        OC.filePath('settings', 'ajax', 'togglegroups.php'),
-                        {
-                            username:user,
-                            group:group
-                        },
-                        function () {
-                        }
-                    );
-                };
-            } else {
-                checkHandeler = false;
-            }
-            var addGroup = function (select, group) {
-                $('select[multiple]').each(function (index, element) {
-                    if ($(element).find('option[value="' + group + '"]').length === 0 && select.data('msid') !== $(element).data('msid')) {
-                        $(element).append('<option value="' + group + '">' + group + '</option>');
-                    }
-                })
-            };
-            var label;
-            if (isadmin) {
-                label = t('settings', 'add group');
-            } else {
-                label = null;
-            }
-            element.multiSelect({
-                createCallback:addGroup,
-                createText:label,
-                selectedFirst:true,
-                checked:checked,
-                oncheck:checkHandeler,
-                onuncheck:checkHandeler,
-                minWidth:100
-            });
-        }
-        if ($(element).attr('class') == 'subadminsselect') {
-            if (element.data('subadmin')) {
-                checked = String(element.data('subadmin')).split(', ');
-            }
-            var checkHandeler = function (group) {
-                if (group == 'admin') {
-                    return false;
-                }
-                $.post(
-                    OC.filePath('settings', 'ajax', 'togglesubadmins.php'),
-                    {
-                        username:user,
-                        group:group
-                    },
-                    function () {
-                    }
-                );
-            };
+	applyMultiplySelect: function (element) {
+		var checked = [];
+		var user = element.attr('data-username');
+		if ($(element).attr('class') == 'groupsselect') {
+			if (element.data('userGroups')) {
+				checked = String(element.data('userGroups')).split(', ');
+			}
+			if (user) {
+				var checkHandeler = function (group) {
+					if (user == OC.currentUser && group == 'admin') {
+						return false;
+					}
+					if (!isadmin && checked.length == 1 && checked[0] == group) {
+						return false;
+					}
+					$.post(
+						OC.filePath('settings', 'ajax', 'togglegroups.php'),
+						{
+							username: user,
+							group: group
+						},
+						function () {
+						}
+					);
+				};
+			} else {
+				checkHandeler = false;
+			}
+			var addGroup = function (select, group) {
+				$('select[multiple]').each(function (index, element) {
+					if ($(element).find('option[value="' + group + '"]').length === 0 && select.data('msid') !== $(element).data('msid')) {
+						$(element).append('<option value="' + group + '">' + group + '</option>');
+					}
+				})
+			};
+			var label;
+			if (isadmin) {
+				label = t('settings', 'add group');
+			} else {
+				label = null;
+			}
+			element.multiSelect({
+				createCallback: addGroup,
+				createText: label,
+				selectedFirst: true,
+				checked: checked,
+				oncheck: checkHandeler,
+				onuncheck: checkHandeler,
+				minWidth: 100
+			});
+		}
+		if ($(element).attr('class') == 'subadminsselect') {
+			if (element.data('subadmin')) {
+				checked = String(element.data('subadmin')).split(', ');
+			}
+			var checkHandeler = function (group) {
+				if (group == 'admin') {
+					return false;
+				}
+				$.post(
+					OC.filePath('settings', 'ajax', 'togglesubadmins.php'),
+					{
+						username: user,
+						group: group
+					},
+					function () {
+					}
+				);
+			};
 
-            var addSubAdmin = function (group) {
-                $('select[multiple]').each(function (index, element) {
-                    if ($(element).find('option[value="' + group + '"]').length == 0) {
-                        $(element).append('<option value="' + group + '">' + group + '</option>');
-                    }
-                })
-            };
-            element.multiSelect({
-                createCallback:addSubAdmin,
-                createText:null,
-                checked:checked,
-                oncheck:checkHandeler,
-                onuncheck:checkHandeler,
-                minWidth:100
-            });
-        }
-    }
+			var addSubAdmin = function (group) {
+				$('select[multiple]').each(function (index, element) {
+					if ($(element).find('option[value="' + group + '"]').length == 0) {
+						$(element).append('<option value="' + group + '">' + group + '</option>');
+					}
+				})
+			};
+			element.multiSelect({
+				createCallback: addSubAdmin,
+				createText: null,
+				checked: checked,
+				oncheck: checkHandeler,
+				onuncheck: checkHandeler,
+				minWidth: 100
+			});
+		}
+	}
 };
 
 $(document).ready(function () {
 
-    $('tbody tr:last').bind('inview', function (event, isInView, visiblePartX, visiblePartY) {
-		OC.Router.registerLoadedCallback(function(){
-        	UserList.update();
+	$('tbody tr:last').bind('inview', function (event, isInView, visiblePartX, visiblePartY) {
+		OC.Router.registerLoadedCallback(function () {
+			UserList.update();
 		});
-    });
+	});
 
-    function setQuota(uid, quota, ready) {
-        $.post(
-            OC.filePath('settings', 'ajax', 'setquota.php'),
-            {username:uid, quota:quota},
-            function (result) {
-                if (ready) {
-                    ready(result.data.quota);
-                }
-            }
-        );
-    }
+	function setQuota (uid, quota, ready) {
+		$.post(
+			OC.filePath('settings', 'ajax', 'setquota.php'),
+			{username: uid, quota: quota},
+			function (result) {
+				if (ready) {
+					ready(result.data.quota);
+				}
+			}
+		);
+	}
 
-    $('select[multiple]').each(function (index, element) {
-        UserList.applyMultiplySelect($(element));
-    });
+	$('select[multiple]').each(function (index, element) {
+		UserList.applyMultiplySelect($(element));
+	});
 
-    $('table').on('click', 'td.remove>a', function (event) {
-        var row = $(this).parent().parent();
-        var uid = $(row).attr('data-uid');
-        $(row).hide();
-        // Call function for handling delete/undo
-        UserList.do_delete(uid);
-    });
+	$('table').on('click', 'td.remove>a', function (event) {
+		var row = $(this).parent().parent();
+		var uid = $(row).attr('data-uid');
+		$(row).hide();
+		// Call function for handling delete/undo
+		UserList.do_delete(uid);
+	});
 
-    $('table').on('click', 'td.password>img', function (event) {
-        event.stopPropagation();
-        var img = $(this);
-        var uid = img.parent().parent().attr('data-uid');
-        var input = $('<input type="password">');
-        img.css('display', 'none');
-        img.parent().children('span').replaceWith(input);
-        input.focus();
-        input.keypress(function (event) {
-            if (event.keyCode == 13) {
-                if ($(this).val().length > 0) {
-                    $.post(
-                        OC.filePath('settings', 'ajax', 'changepassword.php'),
-                        {username:uid, password:$(this).val()},
-                        function (result) {
-                        }
-                    );
-                    input.blur();
-                } else {
-                    input.blur();
-                }
-            }
-        });
-        input.blur(function () {
-            $(this).replaceWith($('<span>●●●●●●●</span>'));
-            img.css('display', '');
-        });
-    });
-    $('table').on('click', 'td.password', function (event) {
-        $(this).children('img').click();
-    });
-    
-    $('table').on('click', 'td.displayName>img', function (event) {
-        event.stopPropagation();
-        var img = $(this);
-        var uid = img.parent().parent().attr('data-uid');
-        var displayName = img.parent().parent().attr('data-displayName');
-        var input = $('<input type="text" value="'+displayName+'">');
-        img.css('display', 'none');
-        img.parent().children('span').replaceWith(input);
-        input.focus();
-        input.keypress(function (event) {
-            if (event.keyCode == 13) {
-                if ($(this).val().length > 0) {
-                    $.post(
-                        OC.filePath('settings', 'ajax', 'changedisplayname.php'),
-                        {username:uid, displayName:$(this).val()},
-                        function (result) {
-                        }
-                    );
-                    input.blur();
-                } else {
-                    input.blur();
-                }
-            }
-        });
-        input.blur(function () {
-            $(this).replaceWith($(this).val());
-            img.css('display', '');
-        });
-    });
-    $('table').on('click', 'td.displayName', function (event) {
-        $(this).children('img').click();
-    });
-    
+	$('table').on('click', 'td.password>img', function (event) {
+		event.stopPropagation();
+		var img = $(this);
+		var uid = img.parent().parent().attr('data-uid');
+		var input = $('<input type="password">');
+		img.css('display', 'none');
+		img.parent().children('span').replaceWith(input);
+		input.focus();
+		input.keypress(function (event) {
+			if (event.keyCode == 13) {
+				if ($(this).val().length > 0) {
+					$.post(
+						OC.filePath('settings', 'ajax', 'changepassword.php'),
+						{username: uid, password: $(this).val()},
+						function (result) {
+						}
+					);
+					input.blur();
+				} else {
+					input.blur();
+				}
+			}
+		});
+		input.blur(function () {
+			$(this).replaceWith($('<span>●●●●●●●</span>'));
+			img.css('display', '');
+		});
+	});
+	$('table').on('click', 'td.password', function (event) {
+		$(this).children('img').click();
+	});
 
-    $('select.quota, select.quota-user').on('change', function () {
-        var select = $(this);
-        var uid = $(this).parent().parent().parent().attr('data-uid');
-        var quota = $(this).val();
-        var other = $(this).next();
-        if (quota != 'other') {
-            other.hide();
-            select.data('previous', quota);
-            setQuota(uid, quota);
-        } else {
-            other.show();
-            select.addClass('active');
-            other.focus();
-        }
-    });
-    $('select.quota, select.quota-user').each(function (i, select) {
-        $(select).data('previous', $(select).val());
-    })
+	$('table').on('click', 'td.displayName>img', function (event) {
+		event.stopPropagation();
+		var img = $(this);
+		var uid = img.parent().parent().attr('data-uid');
+		var displayName = img.parent().parent().attr('data-displayName');
+		var input = $('<input type="text" value="' + displayName + '">');
+		img.css('display', 'none');
+		img.parent().children('span').replaceWith(input);
+		input.focus();
+		input.keypress(function (event) {
+			if (event.keyCode == 13) {
+				if ($(this).val().length > 0) {
+					$.post(
+						OC.filePath('settings', 'ajax', 'changedisplayname.php'),
+						{username: uid, displayName: $(this).val()},
+						function (result) {
+						}
+					);
+					input.blur();
+				} else {
+					input.blur();
+				}
+			}
+		});
+		input.blur(function () {
+			$(this).replaceWith($(this).val());
+			img.css('display', '');
+		});
+	});
+	$('table').on('click', 'td.displayName', function (event) {
+		$(this).children('img').click();
+	});
 
-    $('input.quota-other').on('change', function () {
-        var uid = $(this).parent().parent().parent().attr('data-uid');
-        var quota = $(this).val();
-        var select = $(this).prev();
-        var other = $(this);
-        if (quota) {
-            setQuota(uid, quota, function (quota) {
-                select.children().attr('selected', null);
-                var existingOption = select.children().filter(function (i, option) {
-                    return ($(option).val() == quota);
-                });
-                if (existingOption.length) {
-                    existingOption.attr('selected', 'selected');
-                } else {
-                    var option = $('<option/>');
-                    option.attr('selected', 'selected').attr('value', quota).text(quota);
-                    select.children().last().before(option);
-                }
-                select.val(quota);
-                select.removeClass('active');
-                other.val(null);
-                other.hide();
-            });
-        } else {
-            var previous = select.data('previous');
-            select.children().attr('selected', null);
-            select.children().each(function (i, option) {
-                if ($(option).val() == previous) {
-                    $(option).attr('selected', 'selected');
-                }
-            });
-            select.removeClass('active');
-            other.hide();
-        }
-    });
+	$('select.quota, select.quota-user').singleSelect().on('change', function () {
+		var uid = $(this).parent().parent().attr('data-uid');
+		var quota = $(this).val();
+		setQuota(uid, quota);
+	});
 
-    $('input.quota-other').on('blur', function () {
-        $(this).change();
-    })
-
-    $('#newuser').submit(function (event) {
-        event.preventDefault();
-        var username = $('#newusername').val();
-        var password = $('#newuserpassword').val();
-        if ($('#content table tbody tr').filterAttr('data-uid', username).length > 0) {
-            OC.dialogs.alert(
-                t('settings', 'The username is already being used'),
-                t('settings', 'Error creating user'));
-            return;
-        }
-        if ($.trim(username) == '') {
-            OC.dialogs.alert(
-                t('settings', 'A valid username must be provided'),
-                t('settings', 'Error creating user'));
-            return false;
-        }
-        if ($.trim(password) == '') {
-            OC.dialogs.alert(
-                t('settings', 'A valid password must be provided'),
-                t('settings', 'Error creating user'));
-            return false;
-        }
-        var groups = $('#newusergroups').prev().children('div').data('settings').checked;
-        $('#newuser').get(0).reset();
-        $.post(
-            OC.filePath('settings', 'ajax', 'createuser.php'),
-            {
-                username:username,
-                password:password,
-                groups:groups
-            },
-            function (result) {
-                if (result.status != 'success') {
-                    OC.dialogs.alert(result.data.message,
-                        t('settings', 'Error creating user'));
-                } else {
-                    UserList.add(username, result.data.groups, null, 'default', true);
-                }
-            }
-        );
-    });
-    // Handle undo notifications
-    OC.Notification.hide();
-    $('#notification').on('click', '.undo', function () {
-        if ($('#notification').data('deleteuser')) {
-            $('tbody tr').filterAttr('data-uid', UserList.deleteUid).show();
-            UserList.deleteCanceled = true;
-        }
-        OC.Notification.hide();
-    });
-    UserList.useUndo = ('onbeforeunload' in window)
-    $(window).bind('beforeunload', function () {
-        UserList.finishDelete(null);
-    });
+	$('#newuser').submit(function (event) {
+		event.preventDefault();
+		var username = $('#newusername').val();
+		var password = $('#newuserpassword').val();
+		if ($('#content table tbody tr').filterAttr('data-uid', username).length > 0) {
+			OC.dialogs.alert(
+				t('settings', 'The username is already being used'),
+				t('settings', 'Error creating user'));
+			return;
+		}
+		if ($.trim(username) == '') {
+			OC.dialogs.alert(
+				t('settings', 'A valid username must be provided'),
+				t('settings', 'Error creating user'));
+			return false;
+		}
+		if ($.trim(password) == '') {
+			OC.dialogs.alert(
+				t('settings', 'A valid password must be provided'),
+				t('settings', 'Error creating user'));
+			return false;
+		}
+		var groups = $('#newusergroups').prev().children('div').data('settings').checked;
+		$('#newuser').get(0).reset();
+		$.post(
+			OC.filePath('settings', 'ajax', 'createuser.php'),
+			{
+				username: username,
+				password: password,
+				groups: groups
+			},
+			function (result) {
+				if (result.status != 'success') {
+					OC.dialogs.alert(result.data.message,
+						t('settings', 'Error creating user'));
+				} else {
+					UserList.add(username, result.data.groups, null, 'default', true);
+				}
+			}
+		);
+	});
+	// Handle undo notifications
+	OC.Notification.hide();
+	$('#notification').on('click', '.undo', function () {
+		if ($('#notification').data('deleteuser')) {
+			$('tbody tr').filterAttr('data-uid', UserList.deleteUid).show();
+			UserList.deleteCanceled = true;
+		}
+		OC.Notification.hide();
+	});
+	UserList.useUndo = ('onbeforeunload' in window)
+	$(window).bind('beforeunload', function () {
+		UserList.finishDelete(null);
+	});
 });
diff --git a/settings/templates/users.php b/settings/templates/users.php
index b3cab52694..09a6ae7280 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -33,7 +33,6 @@ $_['subadmingroups'] = array_flip($items);
 	</form>
 	<div class="quota">
 		<span><?php echo $l->t('Default Storage');?></span>
-		<div class="quota-select-wrapper">
 			<?php if((bool) $_['isadmin']): ?>
 			<select class='quota'>
 				<option
@@ -60,7 +59,7 @@ $_['subadmingroups'] = array_flip($items);
 					<?php echo $l->t('Other');?>
 					...
 				</option>
-			</select> <input class='quota-other'/>
+			</select>
 			<?php endif; ?>
 			<?php if((bool) !$_['isadmin']): ?>
 				<select class='quota' disabled="disabled">
@@ -69,7 +68,6 @@ $_['subadmingroups'] = array_flip($items);
 					</option>
 				</select>
 			<?php endif; ?>
-		</div>
 	</div>
 </div>
 
@@ -129,36 +127,34 @@ $_['subadmingroups'] = array_flip($items);
 			</td>
 			<?php endif;?>
 			<td class="quota">
-				<div class="quota-select-wrapper">
-					<select class='quota-user'>
-						<option
-							<?php if($user['quota']=='default') echo 'selected="selected"';?>
-								value='default'>
-							<?php echo $l->t('Default');?>
-						</option>
-						<option
-						<?php if($user['quota']=='none') echo 'selected="selected"';?>
-								value='none'>
-							<?php echo $l->t('Unlimited');?>
-						</option>
-						<?php foreach($_['quota_preset'] as $preset):?>
-						<option
-						<?php if($user['quota']==$preset) echo 'selected="selected"';?>
-							value='<?php echo $preset;?>'>
-							<?php echo $preset;?>
-						</option>
-						<?php endforeach;?>
-						<?php if($user['isQuotaUserDefined']):?>
-						<option selected="selected" value='<?php echo $user['quota'];?>'>
-							<?php echo $user['quota'];?>
-						</option>
-						<?php endif;?>
-						<option value='other'>
-							<?php echo $l->t('Other');?>
-							...
-						</option>
-					</select> <input class='quota-other'/>
-				</div>
+				<select class='quota-user'>
+					<option
+						<?php if($user['quota']=='default') echo 'selected="selected"';?>
+							value='default'>
+						<?php echo $l->t('Default');?>
+					</option>
+					<option
+					<?php if($user['quota']=='none') echo 'selected="selected"';?>
+							value='none'>
+						<?php echo $l->t('Unlimited');?>
+					</option>
+					<?php foreach($_['quota_preset'] as $preset):?>
+					<option
+					<?php if($user['quota']==$preset) echo 'selected="selected"';?>
+						value='<?php echo $preset;?>'>
+						<?php echo $preset;?>
+					</option>
+					<?php endforeach;?>
+					<?php if($user['isQuotaUserDefined']):?>
+					<option selected="selected" value='<?php echo $user['quota'];?>'>
+						<?php echo $user['quota'];?>
+					</option>
+					<?php endif;?>
+					<option value='other' data-new>
+						<?php echo $l->t('Other');?>
+						...
+					</option>
+				</select>
 			</td>
 			<td class="remove">
 				<?php if($user['name']!=OC_User::getUser()):?>
diff --git a/settings/users.php b/settings/users.php
index ab7a7aed73..7fcd1d3ed0 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -11,6 +11,7 @@ OC_App::loadApps();
 // We have some javascript foo!
 OC_Util::addScript( 'settings', 'users' );
 OC_Util::addScript( 'core', 'multiselect' );
+OC_Util::addScript( 'core', 'singleselect' );
 OC_Util::addScript('core', 'jquery.inview');
 OC_Util::addStyle( 'settings', 'settings' );
 OC_App::setActiveNavigationEntry( 'core_users' );