diff --git a/modules/addon/tpl/addon_info.html b/modules/addon/tpl/addon_info.html
index 24b731c32..97441a3cd 100644
--- a/modules/addon/tpl/addon_info.html
+++ b/modules/addon/tpl/addon_info.html
@@ -8,7 +8,6 @@
         <th scope="row"><div>{$lang->title}</div></th>
         <td>{$addon_info->title} ver. {$addon_info->version}</td>
     </tr>
-<!--@if($addon_info->author)-->
     <tr>
         <th scope="row"><div>{$lang->author}</div></th>
         <td>
@@ -16,7 +15,7 @@
             {$author->name} <!--@if($author->homepage || $author->email_address)-->(<!--@if($author->homepage)--><a href="{$author->homepage}" onclick="window.open(this.href);return false;">{$author->homepage}</a><!--@end--><!--@if($author->homepage && $author->email_address)-->, <!--@end--><!--@if($author->email_address)--><a href="mailto:{$author->email_address}">{$author->email_address}</a><!--@end-->)<!--@end--><br />
             <!--@endforeach-->
         </td>
-    </tr><!--@end-->
+    </tr>
 <!--@if($addon_info->homepage)-->
     <tr>
         <th scope="row"><div>{$lang->homepage}</div></th>
diff --git a/modules/admin/tpl/index.html b/modules/admin/tpl/index.html
index be488a4d2..35b4d1349 100644
--- a/modules/admin/tpl/index.html
+++ b/modules/admin/tpl/index.html
@@ -61,7 +61,7 @@
             <td class="number center">{$val->version}</td>
             <td class="nowrap">
                 <!--@foreach($val->author as $author)-->
-                <a href="{$author->homepage}" onclick="window.open(this.href);return false;">{$author->name}</a>
+                <!--@if($author->homepage)--><a href="{$author->homepage}" onclick="window.open(this.href);return false;"><!--@end-->{$author->name}<!--@if($author->homepage)--></a><!--@end-->
                 <!--@endforeach-->
             </td>
             <td class="number center <!--@if($val->created_table_count != $val->table_count)-->alert<!--@end-->">
diff --git a/modules/editor/tpl/view_component.html b/modules/editor/tpl/view_component.html
index 2fa04cc03..c8bd80c0c 100644
--- a/modules/editor/tpl/view_component.html
+++ b/modules/editor/tpl/view_component.html
@@ -11,31 +11,33 @@
         <th scope="row"><div>{$lang->component_author}</div></th>
         <td>
             <!--@foreach($component->author as $author)-->
-            {$author->name} (<a href="{$author->homepage}" onclick="window.open(this.href);return false;">{$author->homepage}</a>, <a href="mailto:{$author->email_address}">{$author->email_address}</a>)<br />
+            {$author->name} <!--@if($author->homepage || $author->email_address)-->(<!--@if($author->homepage)--><a href="{$author->homepage}" onclick="window.open(this.href);return false;">{$author->homepage}</a><!--@end--><!--@if($author->homepage && $author->email_address)-->, <!--@end--><!--@if($author->email_address)--><a href="mailto:{$author->email_address}">{$author->email_address}</a><!--@end-->)<!--@end--><br />
             <!--@end-->
     </tr>
+<!--@if($component->homepage)-->
     <tr>
         <th scope="row"><div>{$lang->homepage}</div></th>
-        <td class="blue"><a href="{$component->homepage}" onclick="window.open(this.href);return false;">{$component->homepage}</a>&nbsp;</td>
-    </tr>
+        <td class="blue"><a href="{$component->homepage}" onclick="window.open(this.href);return false;">{$component->homepage}</a></td>
+    </tr><!--@end-->
     <tr class="row2">
         <th scope="row"><div>{$lang->regdate}</div></th>
         <td>{zdate(str_replace('-',"",$component->date), 'Y-m-d')}</td>
     </tr>
+<!--@if($component->license || $component->license_link)-->
     <tr>
         <th scope="row"><div>{$lang->component_license}</div></th>
         <td>
             {nl2br(trim($component->license))}
-        <!--@if($layout_info->license_link)-->
+        <!--@if($component->license_link)-->
             <p><a href="{$component->license_link}" onclick="window.close(); return false;">{$component->license_link}</a></p>
         <!--@end-->
-        &nbsp;
         </td>
-    </tr>
+    </tr><!--@end-->
+<!--@if($component->description)-->
     <tr class="row2">
         <th scope="row"><div>{$lang->component_description}</div></th>
         <td>{nl2br(trim($component->description))}</td>
-    </tr>
+    </tr><!--@end-->
     </table>
 </div>
 
diff --git a/modules/module/tpl/module_info.html b/modules/module/tpl/module_info.html
index 11f672569..34181d1ad 100644
--- a/modules/module/tpl/module_info.html
+++ b/modules/module/tpl/module_info.html
@@ -13,7 +13,7 @@
         <th scope="row"><div>{$lang->author}</div></th>
         <td class="blue">
             <!--@foreach($module_info->author as $author)-->
-            {$author->name} (<a href="{$author->homepage}" onclick="window.open(this.href);return false;">{$author->homepage}</a>, <a href="mailto:{$author->email_address}">{$author->email_address}</a>)<br />
+            {$author->name} <!--@if($author->homepage || $author->email_address)-->(<!--@if($author->homepage)--><a href="{$author->homepage}" onclick="window.open(this.href);return false;">{$author->homepage}</a><!--@end--><!--@if($author->homepage && $author->email_address)-->, <!--@end--><!--@if($author->email_address)--><a href="mailto:{$author->email_address}">{$author->email_address}</a><!--@end-->)<!--@end--><br />
             <!--@endforeach-->
         </td>
     </tr>
@@ -37,11 +37,12 @@
         <!--@end-->
         </td>
     </tr>
-    <!--@endif-->
+    <!--@endif--><!--@if($module_info->description)-->
     <tr>
         <th scope="row"><div>{$lang->description}</div></th>
         <td>{nl2br(trim($module_info->description))}</td>
     </tr>
+    <!--@endif-->
     </table>
 
 </div>
diff --git a/modules/module/tpl/module_list.html b/modules/module/tpl/module_list.html
index badc09176..c76b9cef0 100644
--- a/modules/module/tpl/module_list.html
+++ b/modules/module/tpl/module_list.html
@@ -24,7 +24,7 @@
             <td class="center number">{$val->version}</td>
             <td class="nowrap">
                 <!--@foreach($val->author as $author)-->
-                <a href="{$author->homepage}" onclick="window.open(this.href);return false;">{$author->name}</a>
+                <!--@if($author->homepage)--><a href="{$author->homepage}" onclick="window.open(this.href);return false;"><!--@end-->{$author->name}<!--@if($author->homepage)--></a><!--@end-->
                 <!--@endforeach-->
             </td>
             <td class="number center <!--@if($val->created_table_count != $val->table_count)-->alert<!--@end-->">
diff --git a/modules/module/tpl/skin_info.html b/modules/module/tpl/skin_info.html
index 41f90128d..9a99722f6 100644
--- a/modules/module/tpl/skin_info.html
+++ b/modules/module/tpl/skin_info.html
@@ -15,7 +15,7 @@
         <th scope="row"><label for="textfield2">{$lang->author}</label></th>
         <td class="blue">
             <!--@foreach($skin_info->author as $author)-->
-            {$author->name} (<a href="{$author->homepage}" onclick="window.open(this.href);return false;">{$author->homepage}</a>, <a href="mailto:{$author->email_address}">{$author->email_address}</a>)<br />
+            {$author->name} <!--@if($author->homepage || $author->email_address)-->(<!--@if($author->homepage)--><a href="{$author->homepage}" onclick="window.open(this.href);return false;">{$author->homepage}</a><!--@end--><!--@if($author->homepage && $author->email_address)-->, <!--@end--><!--@if($author->email_address)--><a href="mailto:{$author->email_address}">{$author->email_address}</a><!--@end-->)<!--@end--><br />
             <!--@endforeach-->
         </td>
     </tr>
@@ -40,10 +40,12 @@
         </td>
     </tr>
     <!--@end-->
+    <!--@if($skin_info->description)-->
     <tr>
         <th scope="row" class="borderBottomNone">{$lang->description}</th>
         <td class="borderBottomNone">{nl2br(trim($skin_info->description))}</td>
     </tr>
+    <!--@end-->
     </table>
 </div>