diff --git a/etemplate/inc/class.uietemplate.inc.php b/etemplate/inc/class.uietemplate.inc.php
index e880d3a25c..779976e314 100644
--- a/etemplate/inc/class.uietemplate.inc.php
+++ b/etemplate/inc/class.uietemplate.inc.php
@@ -97,14 +97,15 @@
 
 			$id = $this->appsession_id();
 
+
 			$GLOBALS['phpgw_info']['etemplate']['loop'] = False;
 			$GLOBALS['phpgw_info']['etemplate']['form_options'] = '';	// might be set in show
 			$html .= $this->html->nextMatchStyles($this->style)."\n\n". // so they get included once
 				$this->html->form($this->include_java_script() .
 					$this->show($this->complete_array_merge($content,$changes),$sel_options,$readonlys,'exec'),
 					array('etemplate_exec_id' => $id),
-					'/index.php?menuaction=etemplate.etemplate.process_exec','','eTemplate',
-					$GLOBALS['phpgw_info']['etemplate']['form_options']);
+					'/index.php?menuaction=etemplate.etemplate.process_exec&app='.$GLOBALS['phpgw_info']['flags']['currentapp'],
+					'','eTemplate',$GLOBALS['phpgw_info']['etemplate']['form_options']);
 
 			$id = $this->save_appsession($this->as_array(1) + array(
 				'readonlys' => $readonlys,
@@ -170,9 +171,6 @@
 			}
 			else
 			{
-				// set application name so that lang, etc. works
-				list($GLOBALS['phpgw_info']['flags']['currentapp']) = explode('.',$session_data['method']);
-
 				ExecMethod($session_data['method'],$this->complete_array_merge($content,$session_data['preserv']));
 			}
 		}