diff --git a/application/core/MY_Lang.php b/application/core/MY_Lang.php
index 75e8c596e..657f7b5c3 100644
--- a/application/core/MY_Lang.php
+++ b/application/core/MY_Lang.php
@@ -72,7 +72,7 @@ class MY_Lang extends CI_Lang
             	else
             	{
             		// just return label name (with TBD)
-            		$line = $line . ' (TBD)';
+            		$line = $this->line_tbd($line);
             		log_message('error', 'Could not find the language line "'.$line.'"');
             	}
             }
@@ -85,6 +85,12 @@ class MY_Lang extends CI_Lang
         
         return $line;
     }
+    
+    function line_tbd($line='')
+    {
+    	return $line . ' (TBD)';
+    }
+    
 }
 
 ?>
diff --git a/application/views/employees/form.php b/application/views/employees/form.php
index 11ac8aa3d..30e3e0d3d 100644
--- a/application/views/employees/form.php
+++ b/application/views/employees/form.php
@@ -65,9 +65,13 @@ foreach($all_modules->result() as $module)
 		$exploded_permission = explode('_', $permission->permission_id);
 		if ($permission->module_id == $module->module_id)
 		{
-			$lang_key = 'reports_'.$exploded_permission[1];
+			$lang_key = $module->module_id.'_'.$exploded_permission[1];
 			$lang_line = $this->lang->line($lang_key);
-			$lang_line = ($lang_key = $lang_line) ? $exploded_permission[1] : $lang_line;
+			$lang_line = ($this->lang->line_tbd($lang_key) == $lang_line) ? $exploded_permission[1] : $lang_line;
+			if (empty($lang_line))
+			{
+				continue;
+			} 
 			?>
 		<ul>
 			<li>