diff --git a/openvidu-server/src/main/java/io/openvidu/server/rest/CertificateRestController.java b/openvidu-server/src/main/java/io/openvidu/server/rest/CertificateRestController.java
index 3db2705f..c5058d9d 100644
--- a/openvidu-server/src/main/java/io/openvidu/server/rest/CertificateRestController.java
+++ b/openvidu-server/src/main/java/io/openvidu/server/rest/CertificateRestController.java
@@ -17,17 +17,20 @@
 
 package io.openvidu.server.rest;
 
-import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
 
-@Controller
+@RestController
+@CrossOrigin
+@RequestMapping("/accept-certificate")
 public class CertificateRestController {
-	
-	@RequestMapping(value = "/accept-certificate", method = RequestMethod.GET)
+
+	@RequestMapping(method = RequestMethod.GET)
 	public String acceptCert() throws Exception {
 		System.out.println("Navigating to accept certificate");
 		return "accept-cert";
 	}
-	
+
 }
\ No newline at end of file