diff --git a/core/view_controller.js b/core/view_controller.js
index d5d7d48f..4b544969 100644
--- a/core/view_controller.js
+++ b/core/view_controller.js
@@ -43,7 +43,6 @@ function ViewController(options) {
 		//	Everything else is forwarded on to the focused View, if any.
 		//
 		var actionForKey = key ? self.actionKeyMap[key.name] : self.actionKeyMap[ch];
-		//var actionForKey = self.actionKeyMap[key.name] || self.actionKeyMap[ch];
 		if(actionForKey) {
 			if(_.isNumber(actionForKey.viewId)) {
 				//
diff --git a/mods/menu.hjson b/mods/menu.hjson
index bfe1e3b0..751f5a92 100644
--- a/mods/menu.hjson
+++ b/mods/menu.hjson
@@ -81,7 +81,8 @@
 								},
 								{
 									value: { 1: 1 },
-									action: @menu:apply
+									action: @menu:newUserApplication
+									//action: @menu:apply
 								},
 								{
 									value: { 1: 2 },
@@ -175,10 +176,10 @@
 							argName: birthdate
 							maskPattern: "####/##/##"
 						}
-						//	:TODO: use a mask edit for this:
-						ET4: {
+						ME4: {
 							argName: sex
-							maxLength: 1
+							maskPattern: A
+							textStyle: U
 						}
 						ET5: {
 							argName: location
@@ -206,16 +207,26 @@
 							password: true
 							maxLength: @config:users.passwordMax
 						}
-						BT12: {
+						TM12: {
+							argName: submission
+							items: [ "Apply", "Cancel" ]
 							submit: true
-							text: Apply
-						}
-						BT13: {
-							submit: true
-							text: Cancel
 						}
 					}
-				}
+
+					submit: {
+						*: [
+							{
+								value: { "submission" : 0 }
+								action: @method:apply/submitApplication
+								extraArgs: {
+									inactive: userNeedsActivated
+									error: newUserCreateError
+								}
+							}
+						]
+					}
+				}				
 			}
 		}
 		"apply" : {
diff --git a/mods/themes/NU-MAYA/NUA.ANS b/mods/themes/NU-MAYA/NUA.ANS
new file mode 100644
index 00000000..a53ce1e3
Binary files /dev/null and b/mods/themes/NU-MAYA/NUA.ANS differ
diff --git a/mods/themes/NU-MAYA/theme.hjson b/mods/themes/NU-MAYA/theme.hjson
index 9e394cf2..233f0b6f 100644
--- a/mods/themes/NU-MAYA/theme.hjson
+++ b/mods/themes/NU-MAYA/theme.hjson
@@ -56,6 +56,29 @@
 				ET10: { width: 21 }
 			}
 
+			newUserApplication: {
+				ET1: { width: 21 }
+				
+				ET2: { width: 21 }
+				
+				/*ME3: {
+					styleSGR1: |00|30|01
+					styleSGR2: |00|37
+					fillChar: "#"
+				}*/
+
+				//ET4: { width: 1	}
+				ET5: { width: 21 }
+				ET6: { width: 21 }
+				ET7: { width: 21 }
+				ET8: { width: 21 }
+				ET9: { width: 21 }
+				ET10: { width: 21 }
+				TM12: {
+					focusTextStyle: first lower
+				}
+			}
+
 			lastCallers: {
 				TL1: {
 					resizable: false