Index: src/main/java/edu/gjoko/schedlr/config/AppSecurityConfig.java
===================================================================
--- src/main/java/edu/gjoko/schedlr/config/AppSecurityConfig.java	(revision 1413ee288bce0d328676a027fdef65e0f7ad576d)
+++ src/main/java/edu/gjoko/schedlr/config/AppSecurityConfig.java	(revision 53765ddd7eb6bc0f9ce45bc734229dd648e2557e)
@@ -68,5 +68,5 @@
                 .antMatchers("/register_customer").permitAll()
                 .antMatchers("/register_business").permitAll()
-                .antMatchers("/api/nomenclatures/*").permitAll()
+                .antMatchers("/api/nomenclature/*").permitAll()
                 .antMatchers("/api/user/me").permitAll()
                 .antMatchers("/api/business").permitAll()
Index: src/main/java/edu/gjoko/schedlr/controllers/LoginController.java
===================================================================
--- src/main/java/edu/gjoko/schedlr/controllers/LoginController.java	(revision 1413ee288bce0d328676a027fdef65e0f7ad576d)
+++ src/main/java/edu/gjoko/schedlr/controllers/LoginController.java	(revision 53765ddd7eb6bc0f9ce45bc734229dd648e2557e)
@@ -22,5 +22,5 @@
     @PostMapping(path = "/login")
     public String loginCustomer(@ModelAttribute Stakeholder customer, Model model) {
-        return "redirect:homepage";
+        return "redirect:login";
     }
 }
Index: src/main/java/edu/gjoko/schedlr/controllers/rest/NomenclatureApi.java
===================================================================
--- src/main/java/edu/gjoko/schedlr/controllers/rest/NomenclatureApi.java	(revision 1413ee288bce0d328676a027fdef65e0f7ad576d)
+++ src/main/java/edu/gjoko/schedlr/controllers/rest/NomenclatureApi.java	(revision 53765ddd7eb6bc0f9ce45bc734229dd648e2557e)
@@ -2,14 +2,17 @@
 
 import edu.gjoko.schedlr.entity.BusinessType;
+import edu.gjoko.schedlr.entity.ServiceType;
 import edu.gjoko.schedlr.services.NomenclaturesService;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 @RestController
-@RequestMapping("api/nomenclatures")
+@RequestMapping("api/nomenclature")
 @AllArgsConstructor
 public class NomenclatureApi {
@@ -20,3 +23,9 @@
         return nomenclaturesService.getBusinessTypes();
     }
+
+    @GetMapping( "/serviceTypes/me")
+    public List<ServiceType> getServiceTypesForBusinessType( HttpServletRequest request) {
+        Long ownerId = (long) request.getSession(true).getAttribute("stakeholderId");
+        return nomenclaturesService.findAppropriateBusinessTypesForBusinessByOwnerId(ownerId);
+    }
 }
Index: src/main/java/edu/gjoko/schedlr/entity/Service.java
===================================================================
--- src/main/java/edu/gjoko/schedlr/entity/Service.java	(revision 1413ee288bce0d328676a027fdef65e0f7ad576d)
+++ src/main/java/edu/gjoko/schedlr/entity/Service.java	(revision 53765ddd7eb6bc0f9ce45bc734229dd648e2557e)
@@ -56,5 +56,5 @@
     @Column(name = "service_status")
     @Enumerated(EnumType.STRING)
-    private ServiceStatus serviceStatus;
+    private ServiceStatus serviceStatus = ServiceStatus.ACTIVE;
 
     @Column(name = "created")
Index: src/main/java/edu/gjoko/schedlr/repositories/ServiceTypeRepository.java
===================================================================
--- src/main/java/edu/gjoko/schedlr/repositories/ServiceTypeRepository.java	(revision 1413ee288bce0d328676a027fdef65e0f7ad576d)
+++ src/main/java/edu/gjoko/schedlr/repositories/ServiceTypeRepository.java	(revision 53765ddd7eb6bc0f9ce45bc734229dd648e2557e)
@@ -1,12 +1,19 @@
 package edu.gjoko.schedlr.repositories;
 
-import edu.gjoko.schedlr.entity.BusinessType;
+import edu.gjoko.schedlr.entity.Service;
 import edu.gjoko.schedlr.entity.ServiceType;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Repository
 public interface ServiceTypeRepository extends JpaRepository<ServiceType, Long> {
+
+    List<ServiceType> findAllByBusinessType_Id(Long businessTypeId);
+
+    @Query(value = "select b.businessType.serviceTypes from Business as b " +
+            " where b.owner.id = :ownerId")
+    List<ServiceType> findAppropriateBusinessTypesForBusinessByOwnerId(Long ownerId);
 }
Index: src/main/java/edu/gjoko/schedlr/services/NomenclaturesService.java
===================================================================
--- src/main/java/edu/gjoko/schedlr/services/NomenclaturesService.java	(revision 1413ee288bce0d328676a027fdef65e0f7ad576d)
+++ src/main/java/edu/gjoko/schedlr/services/NomenclaturesService.java	(revision 53765ddd7eb6bc0f9ce45bc734229dd648e2557e)
@@ -2,4 +2,5 @@
 
 import edu.gjoko.schedlr.entity.BusinessType;
+import edu.gjoko.schedlr.entity.ServiceType;
 import edu.gjoko.schedlr.repositories.BusinessTypeRepository;
 import edu.gjoko.schedlr.repositories.ServiceTypeRepository;
@@ -20,3 +21,7 @@
         return businessTypeRepository.findAll();
     }
+
+    public List<ServiceType> findAppropriateBusinessTypesForBusinessByOwnerId(Long ownerId) {
+        return serviceTypeRepository.findAppropriateBusinessTypesForBusinessByOwnerId(ownerId);
+    }
 }
Index: src/main/resources/data.sql
===================================================================
--- src/main/resources/data.sql	(revision 1413ee288bce0d328676a027fdef65e0f7ad576d)
+++ src/main/resources/data.sql	(revision 53765ddd7eb6bc0f9ce45bc734229dd648e2557e)
@@ -13,6 +13,6 @@
        (nextval('hibernate_sequence'), current_timestamp, current_timestamp, 'waxing', 6),
        (nextval('hibernate_sequence'), current_timestamp, current_timestamp, 'nail extensions', 2),
-       (nextval('hibernate_sequence'), current_timestamp, current_timestamp, 'dress shortening', 1),
-       (nextval('hibernate_sequence'), current_timestamp, current_timestamp, 'holes fixing', 1);
+       (nextval('hibernate_sequence'), current_timestamp, current_timestamp, 'dress sewing', 1),
+       (nextval('hibernate_sequence'), current_timestamp, current_timestamp, 'pants shortening', 1);
 
 insert into stakeholder (id, created, phone_number, email, first_name, last_name, modified, password, stakeholder_type, username)
Index: src/main/resources/static/js/business_admin.js
===================================================================
--- src/main/resources/static/js/business_admin.js	(revision 1413ee288bce0d328676a027fdef65e0f7ad576d)
+++ src/main/resources/static/js/business_admin.js	(revision 53765ddd7eb6bc0f9ce45bc734229dd648e2557e)
@@ -1,8 +1,14 @@
 $(document).ready(function() {
     var business = {};
-
-    getBusinessInfo().then(function (data) {
-        business = data;
-    });
+    var serviceTypeList = {};
+
+    getServiceTypes().then(function (serviceTypes) {
+        serviceTypeList = serviceTypes;
+        getBusinessInfo(serviceTypes).then(function (data) {
+            business = data;
+        });
+    });
+
+
 
     getAppointments();
@@ -71,5 +77,5 @@
 
         updateServices(servicesObj).then(function (response) {
-            getBusinessInfo().then(function (data) {
+            getBusinessInfo(serviceTypeList).then(function (data) {
                 business = data;
             });
@@ -78,5 +84,5 @@
         if (servicesForDelete.length > 0) {
             deleteServices(servicesForDelete).then(function (response) {
-                getBusinessInfo().then(function (data) {
+                getBusinessInfo(serviceTypeList).then(function (data) {
                     business = data;
                 });
@@ -101,5 +107,5 @@
 
         updateBusinessInfo(businesses).then(function() {
-            getBusinessInfo().then(function (found) {
+            getBusinessInfo(serviceTypeList).then(function (found) {
                 business = found;
             });
@@ -205,5 +211,13 @@
 }
 
-function getBusinessInfo() {
+function getServiceTypes() {
+    return $.ajax({
+        url: "http://localhost:8080/api/nomenclature/serviceTypes/me"
+    }).then(function (serviceTypes) {
+        return serviceTypes;
+    });
+}
+
+function getBusinessInfo(serviceTypeList) {
     return $.ajax({
         url: "http://localhost:8080/api/business/me"
@@ -231,4 +245,7 @@
         var $el = $("#predefined_services_admin_panel");
         $el.empty();
+        const existingServiceTypeIds = business['services'].map(service => service['serviceType']['id']);
+        const missingAddedServiceTypes = serviceTypeList.filter(serviceType => existingServiceTypeIds.indexOf(serviceType['id']) === -1);
+        //console.log(missingAddedServiceTypes);
 
         $.each(business['services'], function (index, obj) {
Index: src/main/resources/static/js/customer_admin.js
===================================================================
--- src/main/resources/static/js/customer_admin.js	(revision 1413ee288bce0d328676a027fdef65e0f7ad576d)
+++ src/main/resources/static/js/customer_admin.js	(revision 53765ddd7eb6bc0f9ce45bc734229dd648e2557e)
@@ -1,5 +1,8 @@
 $(document).ready(function() {
-
-    getCustomerInfo();
+    var customer = {};
+
+    getCustomerInfo().then(function (customerData) {
+        customer = customerData;
+    });
 
     getFutureAppointments();
@@ -70,5 +73,5 @@
 
 function getCustomerInfo() {
-    $.ajax({
+    return $.ajax({
         url: "http://localhost:8080/api/customer/me"
     }).success(function (customer) {
@@ -82,4 +85,5 @@
         $('#email').val(customer['email']);
         $('#username').val(customer['username']);
+        return customer;
     }).error(function (error) {
         console.log(JSON.stringify(error));
Index: src/main/resources/static/js/homepage.js
===================================================================
--- src/main/resources/static/js/homepage.js	(revision 1413ee288bce0d328676a027fdef65e0f7ad576d)
+++ src/main/resources/static/js/homepage.js	(revision 53765ddd7eb6bc0f9ce45bc734229dd648e2557e)
@@ -59,5 +59,5 @@
 
     $.ajax({
-        url: "http://localhost:8080/api/nomenclatures/businessTypes"
+        url: "http://localhost:8080/api/nomenclature/businessTypes"
     }).then(function (data) {
         businessTypes = data;
@@ -338,5 +338,5 @@
     }).then(function (data) {
         var $el = $("#reviewsModalBody");
-        $('#reviews-ul').append($('<td class="form-outline mb-4"><button type="button" id="reviews-li" class="btn btn-primary btn-block" data-bs-toggle="modal" data-bs-target="#showReviewsModal">Checkout reviews</button></td>'));
+        $('#reviews-ul').append($('<button type="button" id="reviews-li" class="btn btn-primary btn-block" data-bs-toggle="modal" data-bs-target="#showReviewsModal">Checkout reviews</button>'));
         $el.empty();
 
Index: src/main/resources/static/js/register_business.js
===================================================================
--- src/main/resources/static/js/register_business.js	(revision 1413ee288bce0d328676a027fdef65e0f7ad576d)
+++ src/main/resources/static/js/register_business.js	(revision 53765ddd7eb6bc0f9ce45bc734229dd648e2557e)
@@ -2,9 +2,8 @@
     var enumerations = {};
     $.ajax({
-        url: "http://localhost:8080/api/nomenclatures/businessTypes"
+        url: "http://localhost:8080/api/nomenclature/businessTypes"
     }).then(function (data) {
         enumerations = data;
         var $el = $("#companyType");
-        //$el.empty(); // remove old options
 
         $.each(data, function (index, obj) {
@@ -103,5 +102,4 @@
         });
         businessObj['services'] = servicesObj;
-        console.log(businessObj);
         $.ajax({
             url: "http://localhost:8080/api/business",
@@ -113,5 +111,5 @@
                 alert( "Well done! You have finished the registration process. " +
                     "Please check periodically to see if the company has been approved." );
-                window.location.href = "/homepage";
+                window.location.href = "/login";
             },
             error: function(err) {