diff --git a/workflow/engine/controllers/main.php b/workflow/engine/controllers/main.php
index c31f25ab0..df16f2fe5 100644
--- a/workflow/engine/controllers/main.php
+++ b/workflow/engine/controllers/main.php
@@ -478,28 +478,26 @@ class Main extends Controller
             if (($aFotoSelect = $this->memcache->get('aFotoSelect')) === false) {
                 G::LoadClass('replacementLogo');
                 $oLogoR = new replacementLogo();
-                $aFotoSelect   = $oLogoR->getNameLogo((isset($_SESSION['USER_LOGGED']))?$_SESSION['USER_LOGGED']:'');
+                $aFotoSelect   = $oLogoR->getNameLogo((isset($_SESSION['USER_LOGGED'])) ?
+                    $_SESSION['USER_LOGGED'] : '');
                 $this->memcache->set('aFotoSelect', $aFotoSelect, 1*3600);
             }
-
             if (is_array ($aFotoSelect)) {
                 $sFotoSelect   = trim($aFotoSelect['DEFAULT_LOGO_NAME']);
                 $sWspaceSelect = trim($aFotoSelect['WORKSPACE_LOGO_NAME']);
             }
         }
-
         if (class_exists('PMPluginRegistry')) {
             $oPluginRegistry = &PMPluginRegistry::getSingleton();
-
-            if (isset($sFotoSelect) && $sFotoSelect!='' && !(strcmp($sWspaceSelect,SYS_SYS))) {
+            $logoPlugin = $oPluginRegistry->getCompanyLogo($sCompanyLogo);
+            if ($logoPlugin != '/images/processmaker2.logo2.png') {
+                $sCompanyLogo = $logoPlugin;
+            } elseif (isset($sFotoSelect) && $sFotoSelect!='' && !(strcmp($sWspaceSelect,SYS_SYS))) {
                 $sCompanyLogo = $oPluginRegistry->getCompanyLogo($sFotoSelect);
                 $sCompanyLogo = "/sys".SYS_SYS."/".SYS_LANG."/".SYS_SKIN."/adminProxy/showLogoFile?id=".
                     base64_encode($sCompanyLogo);
-            } else {
-                $sCompanyLogo = $oPluginRegistry->getCompanyLogo($sCompanyLogo);
             }
         }
-
         return $sCompanyLogo;
     }
 
diff --git a/workflow/engine/skinEngine/uxmodern/layout-pm-modern.html b/workflow/engine/skinEngine/uxmodern/layout-pm-modern.html
index 617ba2d41..665aa3e87 100644
--- a/workflow/engine/skinEngine/uxmodern/layout-pm-modern.html
+++ b/workflow/engine/skinEngine/uxmodern/layout-pm-modern.html
@@ -24,7 +24,7 @@
     <table class="x-pm-headerbar">
     <tr>
       <td width="50%" valign="middle">
-        <img src="{$logo_company}" width="250" height="40"/>
+        <img src="{$logo_company}" height="40"/>
       </td>
 
       <td align="right" valign="top">