         - value: The value present in the text field when commit button was pressed
      */
     func didCommitChange(value: String) {
+        self.view.isHidden = true
+        
+        // Break up possible changes into three possibilities: email, password, or other
+        // Email and password change have dedicated function in PromptViewController
+        // Other changes only need to directly modify the user's record for that attribute
         
         if (changingAttribute == .email) {
-            changeEmail(email: value, callback: { (success, error) in
+            
+            // Attempt to change email using dedicated function
+            changeEmail(email: value, callback: { error in
                 
-                if (!success) {
-                    self.view.isHidden = true
-
-                    var message: String
+                if let error = error {
+                    self.presentSimpleAlert(title: "Error changing email", message: error.localizedDescription, completion: { _ in
+                        self.dismiss(animated: true, completion: nil)
+                    })
                     
-                    // Unwrap the error message or give it a general one if N/A
-                    if let error = error { message = error.localizedDescription }
-                    else { message = Constants.Errors.changeEmailError}
-
-                    // Present the alert, and dismiss this whole view when OK is pressed
-                    self.presentSimpleAlert(title: "Error changing email address", message: message, completion: { _ in
+                } else {
+                    self.presentSimpleAlert(title: "Success", message: "Your email address has been updated", completion: { _ in
                         self.dismiss(animated: true, completion: nil)
                     })
                 }

            
        } else if (changingAttribute == .password) {
            
            changePassword(password: value, callback: { error in
                self.view.isHidden = true
                
                if let error = error {
                    self.presentSimpleAlert(title: "Error changing password", message: error.localizedDescription, completion: { _ in

    var changingAttribute: Constants.UserAttribute = .none
    var changingAttributeName: String = ""
    
    
    /**
     A function called right before the view lays out its subviews
     */
    override func viewWillLayoutSubviews() {
        super.viewWillLayoutSubviews()
        
