diff --git a/interface/lib/app.inc.php b/interface/lib/app.inc.php
index 9bf8af7f27d13031d398778b688bae03dbf79d8e..2c304a545105fb52986c7814a998410a679b700a 100644
--- a/interface/lib/app.inc.php
+++ b/interface/lib/app.inc.php
@@ -144,7 +144,7 @@ class app {
         if($this->_language_inc != 1) {
             // loading global and module Wordbook
             @include_once($conf["rootpath"]."/lib/lang/".$_SESSION["s"]["language"].".lng");
-            @include_once($conf["rootpath"]."/web/".$_SESSION["s"]["module"]["name"]."/lib/lang/".$_SESSION["s"]["language"].".lng"); 
+            @include_once($conf["rootpath"]."/web/".$_SESSION["s"]["module"]["name"]."/lib/lang/".$_SESSION["s"]["language"].".lng");
             $this->_wb = $wb;
             $this->_language_inc = 1;
         }
@@ -162,6 +162,11 @@ class app {
                 $this->tpl->setVar('theme',$_SESSION["s"]["theme"]);
                 $this->tpl->setVar('phpsessid',session_id());
                 $this->tpl->setVar('html_content_encoding',$conf["html_content_encoding"]);
+                if($conf["logo"] != '' && @is_file($conf["logo"])){
+                  $this->tpl->setVar('logo', '<img src="'.$conf["logo"].'" border="0" alt="">');
+                } else {
+                  $this->tpl->setVar('logo', '&nbsp;');
+                }
 
           }
 
diff --git a/interface/lib/config.inc.php b/interface/lib/config.inc.php
index 8f63a893ba7c1b1299b21320fe6449c7255293a2..2be920c681747981c4594fbfb9251d2235a4b114 100644
--- a/interface/lib/config.inc.php
+++ b/interface/lib/config.inc.php
@@ -29,9 +29,9 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ini_set('register_globals',0);
 
-$conf["rootpath"] 		= "F:\\server\\www\\ispconfig3\\interface";
-//$conf["rootpath"] 		= "D:\\www\\ispconfig3\\interface";
-//$conf["rootpath"] 		= "/home/www/ispconfig3/web/cms";
+$conf["rootpath"]                 = "F:\\server\\www\\ispconfig3\\interface";
+//$conf["rootpath"]                 = "D:\\www\\ispconfig3\\interface";
+//$conf["rootpath"]                 = "/home/www/ispconfig3/web/cms";
 
 $conf["fs_div"]                 = "\\"; // File system divider, \\ on windows and / on linux and unix
 $conf["classpath"]                 = $conf["rootpath"].$conf["fs_div"]."lib".$conf["fs_div"]."classes";
@@ -64,6 +64,7 @@ $conf["programs"]["wput"]                        = $conf["rootpath"]."\\tools\\w
 
 $conf["theme"]                                         = 'default';
 $conf["html_content_encoding"]        = 'text/html; charset=iso-8859-1';
+$conf["logo"] = 'themes/default/images/mydns_config_logo.png';
 
 /*
         Default Language
diff --git a/interface/web/dns/soa_edit.php b/interface/web/dns/soa_edit.php
index e75f9690994d8c02361b99dde36bea8cb1b5b75e..e38109f6f5b14086f5cf873ffebe90811cf610bb 100644
--- a/interface/web/dns/soa_edit.php
+++ b/interface/web/dns/soa_edit.php
@@ -56,6 +56,11 @@ class page_action extends tform_actions {
         function onSubmit() {
                 global $app, $conf;
 
+                if($app->tform->getCurrentTab() == 'rr'){
+                  parent::onSubmit();
+                  return true;
+                }
+
                 if($this->dataRecord['id'] > 0){
                   if(!$app->tform->checkPerm($this->dataRecord['id'],'u')) $app->error($app->tform->wordbook['error_no_permission']);
                 } else {
diff --git a/interface/web/themes/default/images/mydns_config_logo.png b/interface/web/themes/default/images/mydns_config_logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..2bbecdf539f7835a7b765c928aa6e18bcd5628e1
Binary files /dev/null and b/interface/web/themes/default/images/mydns_config_logo.png differ
diff --git a/interface/web/themes/default/templates/main.tpl.htm b/interface/web/themes/default/templates/main.tpl.htm
index b57e866eadc3a561f9843a60a00ff51a2dc16b5f..3cb8da4c9de6c859449f1cbc679cda142a260b3f 100644
--- a/interface/web/themes/default/templates/main.tpl.htm
+++ b/interface/web/themes/default/templates/main.tpl.htm
@@ -18,7 +18,7 @@ if (window.top != window.self)
 <body bgcolor="#FFFFFF" leftmargin=0 topmargin=0 marginwidth=0 marginheight=0 onload="breakout()">
 <table width="100%" height="100%" border="0" cellpadding="0" cellspacing="0">
   <tr bgcolor="#496FA8">
-    <td height="30" colspan="2" align="center" valign="top" background="themes/{tmpl_var name="theme"}/images/bg_nav_1.jpg">&nbsp;</td>
+    <td height="30" colspan="2" align="right" valign="top" background="themes/{tmpl_var name="theme"}/images/bg_nav_1.jpg"><tmpl_var name="logo"></td>
   </tr>
   <tr bgcolor="#FFFFFF">
     <td height="1" colspan="2" align="center" valign="bottom"><img src="themes/{tmpl_var name="theme"}/images/x.gif" width="1" height="1"></td>