diff --git a/api/dataservices/ssl/ssl.go b/api/dataservices/ssl/ssl.go
index 67f9a28ed..1e913eee5 100644
--- a/api/dataservices/ssl/ssl.go
+++ b/api/dataservices/ssl/ssl.go
@@ -18,14 +18,13 @@ func NewService(connection portainer.Connection) (*Service, error) {
 
 // Settings retrieve the ssl settings object.
 func (service *Service) Settings() (*portainer.SSLSettings, error) {
-	var settings portainer.SSLSettings
-	db := service.connection.GetDB()
-	tx := db.Take(&settings)
-	if tx.Error != nil {
-		return nil, tx.Error
+	var obj portainer.SSLSettings
+	err := service.connection.GetByID(1, &obj)
+	if err != nil {
+		return nil, err
 	}
 
-	return &settings, nil
+	return &obj, nil
 }
 
 // UpdateSettings persists a SSLSettings object.
diff --git a/api/dataservices/user/user.go b/api/dataservices/user/user.go
index 12dd6d9fb..5ed16d647 100644
--- a/api/dataservices/user/user.go
+++ b/api/dataservices/user/user.go
@@ -18,7 +18,7 @@ func NewService(connection portainer.Connection) (*Service, error) {
 
 // User returns a user by ID
 func (service *Service) User(ID portainer.UserID) (*portainer.User, error) {
-	obj := portainer.User{}
+	var obj portainer.User
 
 	err := service.connection.GetByID(int(ID), &obj)
 	if err != nil {