diff --git a/src/main/java/stirling/software/SPDF/controller/FromPDFController.java b/src/main/java/stirling/software/SPDF/controller/FromPDFController.java
index 7f0ede1c3..17a28c27a 100644
--- a/src/main/java/stirling/software/SPDF/controller/FromPDFController.java
+++ b/src/main/java/stirling/software/SPDF/controller/FromPDFController.java
@@ -42,7 +42,7 @@ public class FromPDFController {
 	private String getMediaType(String imageFormat) {
 	    if(imageFormat.equalsIgnoreCase("PNG"))
 	        return "image/png";
-	    else if(imageFormat.equalsIgnoreCase("JPEG"))
+	    else if(imageFormat.equalsIgnoreCase("JPEG") || imageFormat.equalsIgnoreCase("JPG") )
 	        return "image/jpeg";
 	    else if(imageFormat.equalsIgnoreCase("GIF"))
 	        return "image/gif";
diff --git a/src/main/resources/templates/convert-from-pdf.html b/src/main/resources/templates/convert-from-pdf.html
index c1fffd73d..4e997350e 100644
--- a/src/main/resources/templates/convert-from-pdf.html
+++ b/src/main/resources/templates/convert-from-pdf.html
@@ -24,8 +24,8 @@
 					<div class="form-group">
 						<label>Image Format</label> <select class="form-control"
 							name="imageFormat">
-							<option value="jpg">JPEG</option>
 							<option value="png">PNG</option>
+							<option value="jpg">JPEG</option>
 							<option value="gif">GIF</option>
 						</select>
 					</div>
@@ -38,4 +38,4 @@
 	</div>
 	<div th:insert="~{footer.html :: footer}"></div>
 </body>
-</html>
\ No newline at end of file
+</html>