diff --git a/src/bibtex_js.js b/src/bibtex_js.js
index a00d7e6..bf71a02 100644
--- a/src/bibtex_js.js
+++ b/src/bibtex_js.js
@@ -456,7 +456,12 @@ function BibtexDisplay() {
         }
 
         // Get conjunction if set in author
-        conjunction = format.attr('conjunction') ? format.attr('conjunction') : ', and';
+        if (searchLength==2) {
+            conjunction = format.attr('conjunction') ? format.attr('conjunction') : ' and';
+        }
+        else {
+        	   conjunction = format.attr('conjunction') ? format.attr('conjunction') : ', and';
+        }
         conjunction = "<span class='bibtex_js_conjunction'>" + conjunction + "</span>";
 
         var newString = "";
@@ -3672,4 +3677,4 @@ var latex_to_unicode = {
     "{\\o}": "\u00D8",
     "{\AA}": "\u212B",
     "\\relax ": ""
-};
\ No newline at end of file
+};