diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/ClarinUserInfoController.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/ClarinUserInfoController.java
new file mode 100644
index 000000000000..453d428224e3
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/ClarinUserInfoController.java
@@ -0,0 +1,49 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest;
+
+import java.io.IOException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.google.gson.JsonObject;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * This class is a REST controller that returns information about the client user.
+ * E.g. the client's IP address.
+ *
+ * @author Milan Majchrak (milan.majchrak at dataquest.sk)
+ */
+@RequestMapping(value = "/api/userinfo")
+@RestController
+public class ClarinUserInfoController {
+
+    /**
+     * This method returns the client's IP address.
+     * @param request The HttpServletRequest object.
+     * @return The client's IP address.
+     */
+    @RequestMapping(method = RequestMethod.GET, path = "/ipaddress")
+    public ResponseEntity getUserIPAddress(HttpServletRequest request, HttpServletResponse response)
+            throws IOException {
+        // Get client's IP address
+        String ipAddress = request.getRemoteAddr();
+        if (StringUtils.isBlank(ipAddress)) {
+            response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "Cannot get user's IP address");
+        }
+        // Create JSON object
+        JsonObject jsonObject = new JsonObject();
+        jsonObject.addProperty("ipAddress", ipAddress);
+        return ResponseEntity.ok(jsonObject.toString());
+    }
+}
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/ClarinUserInfoControllerIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/ClarinUserInfoControllerIT.java
new file mode 100644
index 000000000000..be32cc55a656
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/ClarinUserInfoControllerIT.java
@@ -0,0 +1,34 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import javax.ws.rs.core.MediaType;
+
+import org.dspace.app.rest.test.AbstractControllerIntegrationTest;
+import org.junit.Test;
+
+/**
+ * This class test the REST controller that returns information about the client user.
+ * E.g. the client's IP address.
+ *
+ * @author Milan Majchrak (milan.majchrak at dataquest.sk)
+ */
+public class ClarinUserInfoControllerIT extends AbstractControllerIntegrationTest {
+
+    @Test
+    public void getUserIPAddress() throws Exception {
+        getClient().perform(get("/api/userinfo/ipaddress")
+                        .contentType(MediaType.APPLICATION_JSON))
+                .andExpect(status().isOk())
+                .andExpect(content().json("{\"ipAddress\":\"127.0.0.1\"}"));
+    }
+}