diff --git a/src/main/java/org/ecocean/servlet/SubmitSpotsAndImage.java b/src/main/java/org/ecocean/servlet/SubmitSpotsAndImage.java
index 40cf4a6965..1e1beab5e0 100755
--- a/src/main/java/org/ecocean/servlet/SubmitSpotsAndImage.java
+++ b/src/main/java/org/ecocean/servlet/SubmitSpotsAndImage.java
@@ -121,13 +121,23 @@ public void doPost(HttpServletRequest request, HttpServletResponse response)
 	        String speciesString = enc.getTaxonomyString();
 	        Annotation ann = new Annotation(speciesString, crMa);
 	        ann.setMatchAgainst(true);
-	        String iaClass = "whalesharkCR"; // should we change this?
-	        if(enc.getSpecificEpithet()!=null) {
-	        	if(enc.getSpecificEpithet().equals("tigrinum")) {
-	        		iaClass = "leopard_shark";
-	        	}
+	        //WB-1841 only whale sharks are currently matchable via this method
+	        if(speciesString!=null && speciesString.equals("Rhincodon typus")) {
+	          ann.setMatchAgainst(true);
+	          String iaClass = "whaleshark"; // should we change this?
+	          ann.setIAClass(iaClass);
 	        }
-	        ann.setIAClass(iaClass);
+	        else if(speciesString!=null && speciesString.equals("Stegostoma tigrinum")) {
+	          ann.setMatchAgainst(true);
+	          String iaClass = "leopard_shark"; // should we change this?
+	          ann.setIAClass(iaClass);
+	        }
+	        else if(speciesString!=null && speciesString.equals("Scyliorhinus stellaris")) {
+	          ann.setMatchAgainst(true);
+	          String iaClass = "nursehoundsharkCR"; // should we change this?
+	          ann.setIAClass(iaClass);
+	        }
+
 	        if (rightSide) { ann.setViewpoint("right"); } else { ann.setViewpoint("left"); }
 	        enc.addAnnotation(ann);
 	        System.out.println("    + made annotation " + ann.toString());