diff --git a/application/src/main/java/org/thingsboard/server/controller/OAuth2Controller.java b/application/src/main/java/org/thingsboard/server/controller/OAuth2Controller.java
new file mode 100644
index 0000000000..07a0523223
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/controller/OAuth2Controller.java
@@ -0,0 +1,61 @@
+/**
+ * Copyright © 2016-2020 The Thingsboard Authors
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.controller;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.oauth2.OAuth2ClientRegistration;
+import org.thingsboard.server.dao.oauth2.OAuth2ClientRegistrationService;
+import org.thingsboard.server.dao.oauth2.OAuth2Service;
+import org.thingsboard.server.queue.util.TbCoreComponent;
+
+@RestController
+@TbCoreComponent
+@RequestMapping("/api")
+@Slf4j
+public class OAuth2Controller extends BaseController {
+    private static final String REGISTRATION_ID = "registrationId";
+
+    @Autowired
+    private OAuth2Service oauth2Service;
+    @Autowired
+    private OAuth2ClientRegistrationService oAuth2ClientRegistrationService;
+
+    @PreAuthorize("hasAnyAuthority('SYS_ADMIN')")
+    @RequestMapping(value = "/oauth2/config/{" + REGISTRATION_ID + "}", method = RequestMethod.GET)
+    @ResponseBody
+    public OAuth2ClientRegistration getClientRegistrationById(@PathVariable(REGISTRATION_ID) String registrationId) throws ThingsboardException {
+        try {
+            return oauth2Service.getClientRegistrationByRegistrationId(registrationId);
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+    @PreAuthorize("hasAnyAuthority('SYS_ADMIN')")
+    @RequestMapping(value = "/oauth2/config", method = RequestMethod.POST)
+    @ResponseBody
+    public OAuth2ClientRegistration saveClientRegistration(@RequestBody OAuth2ClientRegistration clientRegistration) throws ThingsboardException {
+        try {
+            return oAuth2ClientRegistrationService.saveClientRegistration(clientRegistration);
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+}
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/OAuth2ClientRegistrationEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/OAuth2ClientRegistrationEntity.java
index c3c96c1838..dfca90359f 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/OAuth2ClientRegistrationEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/OAuth2ClientRegistrationEntity.java
@@ -134,7 +134,7 @@ public class OAuth2ClientRegistrationEntity extends BaseSqlEntity<OAuth2ClientRe
                 this.alwaysFullScreen = basicConfig.isAlwaysFullScreen();
             }
             OAuth2CustomMapperConfig customConfig = mapperConfig.getCustomConfig();
-            if (customConfig != null){
+            if (customConfig != null) {
                 this.url = customConfig.getUrl();
                 this.username = customConfig.getUsername();
                 this.password = customConfig.getPassword();
@@ -152,23 +152,27 @@ public class OAuth2ClientRegistrationEntity extends BaseSqlEntity<OAuth2ClientRe
                         .activateUser(activateUser)
                         .type(type)
                         .basicConfig(
-                                OAuth2BasicMapperConfig.builder()
-                                        .emailAttributeKey(emailAttributeKey)
-                                        .firstNameAttributeKey(firstNameAttributeKey)
-                                        .lastNameAttributeKey(lastNameAttributeKey)
-                                        .tenantNameStrategy(tenantNameStrategy)
-                                        .tenantNamePattern(tenantNamePattern)
-                                        .customerNamePattern(customerNamePattern)
-                                        .defaultDashboardName(defaultDashboardName)
-                                        .alwaysFullScreen(alwaysFullScreen)
-                                        .build()
+                                type == MapperType.BASIC ?
+                                        OAuth2BasicMapperConfig.builder()
+                                                .emailAttributeKey(emailAttributeKey)
+                                                .firstNameAttributeKey(firstNameAttributeKey)
+                                                .lastNameAttributeKey(lastNameAttributeKey)
+                                                .tenantNameStrategy(tenantNameStrategy)
+                                                .tenantNamePattern(tenantNamePattern)
+                                                .customerNamePattern(customerNamePattern)
+                                                .defaultDashboardName(defaultDashboardName)
+                                                .alwaysFullScreen(alwaysFullScreen)
+                                                .build()
+                                        : null
                         )
                         .customConfig(
-                                OAuth2CustomMapperConfig.builder()
-                                        .url(url)
-                                        .username(username)
-                                        .password(password)
-                                        .build()
+                                type == MapperType.CUSTOM ?
+                                        OAuth2CustomMapperConfig.builder()
+                                                .url(url)
+                                                .username(username)
+                                                .password(password)
+                                                .build()
+                                        : null
                         )
                         .build())
                 .clientId(clientId)
diff --git a/dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2ClientRegistrationServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2ClientRegistrationServiceImpl.java
index 85e5ff84d8..f19e819550 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2ClientRegistrationServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2ClientRegistrationServiceImpl.java
@@ -39,7 +39,8 @@ public class OAuth2ClientRegistrationServiceImpl implements OAuth2ClientRegistra
     @Override
     public OAuth2ClientRegistration saveClientRegistration(OAuth2ClientRegistration clientRegistration) {
         log.trace("Executing saveClientRegistration [{}]", clientRegistration);
-        return null;
+        // TODO add checking for duplicates and other validations
+        return clientRegistrationDao.save(clientRegistration);
     }
 
     @Override
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/oauth2/JpaOAuth2ClientRegistrationDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/oauth2/JpaOAuth2ClientRegistrationDao.java
index 98e1b8431a..63068d80fb 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/oauth2/JpaOAuth2ClientRegistrationDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/oauth2/JpaOAuth2ClientRegistrationDao.java
@@ -15,6 +15,7 @@
  */
 package org.thingsboard.server.dao.sql.oauth2;
 
+import com.datastax.oss.driver.api.core.uuid.Uuids;
 import com.google.common.collect.Lists;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -47,6 +48,9 @@ public class JpaOAuth2ClientRegistrationDao implements OAuth2ClientRegistrationD
             throw new IllegalArgumentException("Can't create entity for domain object {" + clientRegistration + "}", e);
         }
         log.debug("Saving entity {}", entity);
+        if (entity.getUuid() == null) {
+            entity.setUuid(Uuids.timeBased());
+        }
         entity = repository.save(entity);
         return DaoUtil.getData(entity);
     }