Index: trunk/src/org/openmrs/module/htmlformentry/element/EncounterDetailSubmissionElement.java
===================================================================
--- trunk/src/org/openmrs/module/htmlformentry/element/EncounterDetailSubmissionElement.java	(revision 11142)
+++ trunk/src/org/openmrs/module/htmlformentry/element/EncounterDetailSubmissionElement.java	(working copy)
@@ -78,9 +78,15 @@
             else {
             	String defParam = (String)parameters.get("default");
             	if (StringUtils.hasText(defParam)) {
-            		User defaultProvider = Context.getUserService().getUserByUsername(defParam);
-            		if (defaultProvider == null) {
-            			defaultProvider = Context.getUserService().getUser(Integer.parseInt(defParam));
+            		User defaultProvider;
+            		if(defParam.equals("currentUser")){
+            			defaultProvider = Context.getAuthenticatedUser();
+            		}
+            		else{
+	            		defaultProvider = Context.getUserService().getUserByUsername(defParam);
+	            		if (defaultProvider == null) {
+	            			defaultProvider = Context.getUserService().getUser(Integer.parseInt(defParam));
+	            		}
             		}
             		if (defaultProvider == null) {
             			throw new IllegalArgumentException("Invalid default provider specified for encounter: " + defParam);