diff --git a/admin/install.php b/admin/install.php
index 573a81fd1f..c4a311a149 100644
--- a/admin/install.php
+++ b/admin/install.php
@@ -672,10 +672,16 @@ function print_test( $p_test_description, $p_result, $p_hard_fail = true, $p_mes
 		echo "\t\t" . $t_prefix_labels[$t_key] . "\n";
 		echo "\t</td>\n\t<td>\n\t\t";
 		echo '<input id="' . $t_key . '" name="' . $t_key . '" type="text" class="db-table-prefix" value="' . $f_db_table_prefix . '">';
+		echo "\n&nbsp;";
 		if( $t_key != 'db_table_suffix' ) {
 			$t_id_sample = $t_key. '_sample';
-			echo "\n&nbsp;", '<label for="' . $t_id_sample . '">Sample table name:</label>';
+			echo '<label for="' . $t_id_sample . '">Sample table name:</label>';
 			echo "\n", '<input id="' . $t_id_sample . '" type="text" size="40" disabled>';
+		} else {
+			echo '<span id="oracle_size_warning" >';
+			echo "On Oracle < 12cR2, max length for identifiers is 30 chars. "
+				. "Keep pre/suffixes as short as possible to avoid problems.";
+			echo '<span>';
 		}
 		echo "\n\t</td>\n</tr>\n\n";
 	}
diff --git a/js/install.js b/js/install.js
index 366de6f255..a77179f667 100644
--- a/js/install.js
+++ b/js/install.js
@@ -30,8 +30,10 @@ $('#db_type').change(
 		var db;
 		if ($(this).val() == 'oci8') {
 			db = 'oci8';
+			$('#oracle_size_warning').show();
 		} else {
 			db = 'other';
+			$('#oracle_size_warning').hide();
 		}
 
 		$('#default_' + db + ' span').each(