diff --git a/application/forms/Config/Resource/DbResourceForm.php b/application/forms/Config/Resource/DbResourceForm.php
index b9979eed5..331731368 100644
--- a/application/forms/Config/Resource/DbResourceForm.php
+++ b/application/forms/Config/Resource/DbResourceForm.php
@@ -58,7 +58,7 @@ class DbResourceForm extends Form
             $offerMysql = true;
         }
 
-        if ($dbChoice === 'oracle') {
+        if ($dbChoice === 'oracle' || $dbChoice === 'oci') {
             $hostIsRequired = false;
         } else {
             $hostIsRequired = true;
diff --git a/library/Icinga/Application/Platform.php b/library/Icinga/Application/Platform.php
index 025bf7729..185a69e92 100644
--- a/library/Icinga/Application/Platform.php
+++ b/library/Icinga/Application/Platform.php
@@ -406,7 +406,7 @@ class Platform
      */
     public static function hasOracleSupport()
     {
-        return static::extensionLoaded('pdo_oci') && static::classExists('Zend_Db_Adapter_Pdo_Mysql');
+        return static::extensionLoaded('pdo_oci') && static::classExists('Zend_Db_Adapter_Pdo_Oci');
     }
 
     /**