diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index aea0cc1b1..dbf7e807e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -416,8 +416,6 @@ jobs:
         env:
            MARIADB_ALLOW_EMPTY_PASSWORD: 1
            MARIADB_USER: root
-       # ports: 
-        #  - 3306:3306
         options: --health-cmd="mysqladmin ping"
                  --health-interval=5s
                  --health-timeout=5s
@@ -426,11 +424,14 @@ jobs:
       - name: get mariadb container id
         run: echo "::set-output name=id::$(docker container ls | grep mariadb | awk '{ print $1 }')"
         id: mariadb_container
-      - name: show networks
-        run: echo "$(docker network ls)"
       - name: get automatic created network
         run: echo "::set-output name=id::$(docker network ls | grep github_network | awk '{ print $1 }')"
         id: network
+      - name: Start database migration
+        run: docker run --network ${{ steps.network.outputs.id }} --name=database --env NODE_ENV=production --env DB_HOST=mariadb -d gradido/database:production_up
+      - name: get database migration container id
+        run: echo "::set-output name=id::$(docker container ls | grep database | awk '{ print $1 }')"
+        id: database_container
       - name: Start Login-Server
         run: docker run --network ${{ steps.network.outputs.id }} --name=login-server -d gradido/login_server:with-config
       - name: get login-server container id
@@ -451,12 +452,13 @@ jobs:
           path: /tmp
       - name: Load Docker Image
         run: docker load < /tmp/community_server.tar
-        
       # for debugging login-server
       - name: check login-server
         run: docker logs ${{ steps.login_server_container.outputs.id }}
       - name: check mariadb
         run: docker logs ${{ steps.mariadb_container.outputs.id }}
+      - name: check migration
+        run: docker logs ${{ steps.database_container.outputs.id }}
       ##########################################################################
       # UNIT TESTS BACKEND COMMUNITY-SERVER  #######################################
       ##########################################################################
diff --git a/backend/package-lock.json b/backend/package-lock.json
index 973641e63..44ff1180f 100644
--- a/backend/package-lock.json
+++ b/backend/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "gradido-backend",
-  "version": "0.0.1",
+  "version": "1.4.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -1388,6 +1388,22 @@
         "parse5": "^5.1.1",
         "parse5-htmlparser2-tree-adapter": "^6.0.0",
         "yargs": "^16.0.0"
+      },
+      "dependencies": {
+        "yargs": {
+          "version": "16.2.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+          "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+          "requires": {
+            "cliui": "^7.0.2",
+            "escalade": "^3.1.1",
+            "get-caller-file": "^2.0.5",
+            "require-directory": "^2.1.1",
+            "string-width": "^4.2.0",
+            "y18n": "^5.0.5",
+            "yargs-parser": "^20.2.2"
+          }
+        }
       }
     },
     "cliui": {
@@ -1568,6 +1584,11 @@
         "object-keys": "^1.0.12"
       }
     },
+    "denque": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/denque/-/denque-1.5.1.tgz",
+      "integrity": "sha512-XwE+iZ4D6ZUB7mfYRMb5wByE8L74HCn30FBN7sWnXksWc1LO1bPDl67pBR9o/kC4z/xSNAwkMYcGgqDV3BE3Hw=="
+    },
     "depd": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
@@ -1633,9 +1654,9 @@
       }
     },
     "dotenv": {
-      "version": "8.6.0",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.6.0.tgz",
-      "integrity": "sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g=="
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz",
+      "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q=="
     },
     "duplexer3": {
       "version": "0.1.4",
@@ -2051,6 +2072,55 @@
       "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.2.tgz",
       "integrity": "sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q=="
     },
+    "express": {
+      "version": "4.17.1",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
+      "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==",
+      "requires": {
+        "accepts": "~1.3.7",
+        "array-flatten": "1.1.1",
+        "body-parser": "1.19.0",
+        "content-disposition": "0.5.3",
+        "content-type": "~1.0.4",
+        "cookie": "0.4.0",
+        "cookie-signature": "1.0.6",
+        "debug": "2.6.9",
+        "depd": "~1.1.2",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "finalhandler": "~1.1.2",
+        "fresh": "0.5.2",
+        "merge-descriptors": "1.0.1",
+        "methods": "~1.1.2",
+        "on-finished": "~2.3.0",
+        "parseurl": "~1.3.3",
+        "path-to-regexp": "0.1.7",
+        "proxy-addr": "~2.0.5",
+        "qs": "6.7.0",
+        "range-parser": "~1.2.1",
+        "safe-buffer": "5.1.2",
+        "send": "0.17.1",
+        "serve-static": "1.14.1",
+        "setprototypeof": "1.1.1",
+        "statuses": "~1.5.0",
+        "type-is": "~1.6.18",
+        "utils-merge": "1.0.1",
+        "vary": "~1.1.2"
+      },
+      "dependencies": {
+        "safe-buffer": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+        },
+        "setprototypeof": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
+          "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="
+        }
+      }
+    },
     "fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@@ -2097,9 +2167,9 @@
       }
     },
     "figlet": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/figlet/-/figlet-1.5.0.tgz",
-      "integrity": "sha512-ZQJM4aifMpz6H19AW1VqvZ7l4pOE9p7i/3LyxgO2kp+PO/VcDYNqIHEMtkccqIhTXMKci4kjueJr/iCQEaT/Ww=="
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/figlet/-/figlet-1.5.2.tgz",
+      "integrity": "sha512-WOn21V8AhyE1QqVfPIVxe3tupJacq1xGkPTB4iagT6o+P2cAgEOOwIxMftr4+ZCTI6d551ij9j61DFr0nsP2uQ=="
     },
     "file-entry-cache": {
       "version": "6.0.1",
@@ -2209,6 +2279,14 @@
       "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
       "dev": true
     },
+    "generate-function": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.3.1.tgz",
+      "integrity": "sha512-eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ==",
+      "requires": {
+        "is-property": "^1.0.2"
+      }
+    },
     "get-caller-file": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
@@ -2654,6 +2732,11 @@
       "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
       "dev": true
     },
+    "is-property": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
+      "integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ="
+    },
     "is-regex": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.3.tgz",
@@ -2800,14 +2883,6 @@
         "json-buffer": "3.0.0"
       }
     },
-    "klicktipp-api": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/klicktipp-api/-/klicktipp-api-1.0.2.tgz",
-      "integrity": "sha512-aQQpuznC0O2W7Oq2BxKDnuLAnGmKTMfudOQ0TAEf0TLv82KH2AsCXl0nbutJ2g1i3MH+sCyGE/r/nwnUhr4QeA==",
-      "requires": {
-        "axios": "^0.21.1"
-      }
-    },
     "latest-version": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-5.1.0.tgz",
@@ -3035,6 +3110,31 @@
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
       "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
     },
+    "mysql2": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-2.3.0.tgz",
+      "integrity": "sha512-0t5Ivps5Tdy5YHk5NdKwQhe/4Qyn2pload+S+UooDBvsqngtzujG1BaTWBihQLfeKO3t3122/GtusBtmHEHqww==",
+      "requires": {
+        "denque": "^1.4.1",
+        "generate-function": "^2.3.1",
+        "iconv-lite": "^0.6.2",
+        "long": "^4.0.0",
+        "lru-cache": "^6.0.0",
+        "named-placeholders": "^1.1.2",
+        "seq-queue": "^0.0.5",
+        "sqlstring": "^2.3.2"
+      },
+      "dependencies": {
+        "iconv-lite": {
+          "version": "0.6.3",
+          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+          "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+          "requires": {
+            "safer-buffer": ">= 2.1.2 < 3.0.0"
+          }
+        }
+      }
+    },
     "mz": {
       "version": "2.7.0",
       "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
@@ -3045,6 +3145,30 @@
         "thenify-all": "^1.0.0"
       }
     },
+    "named-placeholders": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/named-placeholders/-/named-placeholders-1.1.2.tgz",
+      "integrity": "sha512-wiFWqxoLL3PGVReSZpjLVxyJ1bRqe+KKJVbr4hGs1KWfTZTQyezHFBbuKj9hsizHyGV2ne7EMjHdxEGAybD5SA==",
+      "requires": {
+        "lru-cache": "^4.1.3"
+      },
+      "dependencies": {
+        "lru-cache": {
+          "version": "4.1.5",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+          "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
+          "requires": {
+            "pseudomap": "^1.0.2",
+            "yallist": "^2.1.2"
+          }
+        },
+        "yallist": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+          "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI="
+        }
+      }
+    },
     "natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
@@ -3419,6 +3543,11 @@
         "ipaddr.js": "1.9.1"
       }
     },
+    "pseudomap": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
+      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
+    },
     "pstree.remy": {
       "version": "1.1.8",
       "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz",
@@ -3551,6 +3680,11 @@
         "picomatch": "^2.2.1"
       }
     },
+    "reflect-metadata": {
+      "version": "0.1.13",
+      "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz",
+      "integrity": "sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg=="
+    },
     "regexpp": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
@@ -3714,6 +3848,11 @@
         }
       }
     },
+    "seq-queue": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/seq-queue/-/seq-queue-0.0.5.tgz",
+      "integrity": "sha1-1WgS4cAXpuTnw+Ojeh2m143TyT4="
+    },
     "serve-static": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz",
@@ -3841,6 +3980,11 @@
       "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
       "dev": true
     },
+    "sqlstring": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/sqlstring/-/sqlstring-2.3.2.tgz",
+      "integrity": "sha512-vF4ZbYdKS8OnoJAWBmMxCQDkiEBkGQYU7UZPtL8flbDRSNkhaXvRJ279ZtI6M+zDaQovVU4tuRgzK5fVhvFAhg=="
+    },
     "statuses": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
@@ -4151,15 +4295,15 @@
       }
     },
     "typeorm": {
-      "version": "0.2.34",
-      "resolved": "https://registry.npmjs.org/typeorm/-/typeorm-0.2.34.tgz",
-      "integrity": "sha512-FZAeEGGdSGq7uTH3FWRQq67JjKu0mgANsSZ04j3kvDYNgy9KwBl/6RFgMVgiSgjf7Rqd7NrhC2KxVT7I80qf7w==",
+      "version": "0.2.37",
+      "resolved": "https://registry.npmjs.org/typeorm/-/typeorm-0.2.37.tgz",
+      "integrity": "sha512-7rkW0yCgFC24I5T0f3S/twmLSuccPh1SQmxET/oDWn2sSDVzbyWdnItSdKy27CdJGTlKHYtUVeOcMYw5LRsXVw==",
       "requires": {
         "@sqltools/formatter": "^1.2.2",
         "app-root-path": "^3.0.0",
         "buffer": "^6.0.3",
         "chalk": "^4.1.0",
-        "cli-highlight": "^2.1.10",
+        "cli-highlight": "^2.1.11",
         "debug": "^4.3.1",
         "dotenv": "^8.2.0",
         "glob": "^7.1.6",
@@ -4170,7 +4314,7 @@
         "tslib": "^2.1.0",
         "xml2js": "^0.4.23",
         "yargonaut": "^1.1.4",
-        "yargs": "^16.2.0",
+        "yargs": "^17.0.1",
         "zen-observable-ts": "^1.0.0"
       },
       "dependencies": {
@@ -4180,13 +4324,18 @@
           "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
         },
         "debug": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+          "version": "4.3.2",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
+          "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
           "requires": {
             "ms": "2.1.2"
           }
         },
+        "dotenv": {
+          "version": "8.6.0",
+          "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.6.0.tgz",
+          "integrity": "sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g=="
+        },
         "js-yaml": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
@@ -4206,9 +4355,9 @@
           "integrity": "sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg=="
         },
         "tslib": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
-          "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
+          "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="
         }
       }
     },
@@ -4521,9 +4670,9 @@
       }
     },
     "yargs": {
-      "version": "16.2.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
-      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+      "version": "17.2.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.2.0.tgz",
+      "integrity": "sha512-UPeZv4h9Xv510ibpt5rdsUNzgD78nMa1rhxxCgvkKiq06hlKCEHJLiJ6Ub8zDg/wR6hedEI6ovnd2vCvJ4nusA==",
       "requires": {
         "cliui": "^7.0.2",
         "escalade": "^3.1.1",
@@ -4551,12 +4700,12 @@
       "integrity": "sha512-PQ2PC7R9rslx84ndNBZB/Dkv8V8fZEpk83RLgXtYd0fwUgEjseMn1Dgajh2x6S8QbZAFa9p2qVCEuYZNgve0dQ=="
     },
     "zen-observable-ts": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/zen-observable-ts/-/zen-observable-ts-1.0.0.tgz",
-      "integrity": "sha512-KmWcbz+9kKUeAQ8btY8m1SsEFgBcp7h/Uf3V5quhan7ZWdjGsf0JcGLULQiwOZibbFWnHkYq8Nn2AZbJabovQg==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/zen-observable-ts/-/zen-observable-ts-1.1.0.tgz",
+      "integrity": "sha512-1h4zlLSqI2cRLPJUHJFL8bCWHhkpuXkF+dbGkRaWjgDIG26DmzyshUMrdV/rL3UnR+mhaX4fRq8LPouq0MYYIA==",
       "requires": {
-        "@types/zen-observable": "^0.8.2",
-        "zen-observable": "^0.8.15"
+        "@types/zen-observable": "0.8.3",
+        "zen-observable": "0.8.15"
       }
     }
   }
diff --git a/backend/package.json b/backend/package.json
index 716828438..bb7848013 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -25,7 +25,8 @@
     "jsonwebtoken": "^8.5.1",
     "mysql2": "^2.3.0",
     "reflect-metadata": "^0.1.13",
-    "type-graphql": "^1.1.1"
+    "type-graphql": "^1.1.1",
+    "typeorm": "^0.2.37"
   },
   "devDependencies": {
     "@types/express": "^4.17.12",
diff --git a/backend/src/index.ts b/backend/src/index.ts
index 0a90770f7..bd58f8c86 100644
--- a/backend/src/index.ts
+++ b/backend/src/index.ts
@@ -23,7 +23,7 @@ import { isAuthorized } from './auth/auth'
 // TODO implement
 // import queryComplexity, { simpleEstimator, fieldConfigEstimator } from "graphql-query-complexity";
 
-const DB_VERSION = '0002-update_user'
+const DB_VERSION = '0001-init_db'
 
 const context = (args: any) => {
   const authorization = args.req.headers.authorization
diff --git a/backend/src/typeorm/connection.ts b/backend/src/typeorm/connection.ts
index f954593ad..b108c5ef5 100644
--- a/backend/src/typeorm/connection.ts
+++ b/backend/src/typeorm/connection.ts
@@ -15,8 +15,6 @@ const connection = async (): Promise<Connection> => {
     synchronize: false,
   })
 
-  // await con.connect()
-
   return con
 }
 
diff --git a/backend/src/typeorm/entity/User.ts b/backend/src/typeorm/entity/User.ts
index 2aab67cdd..cb9de27c8 100644
--- a/backend/src/typeorm/entity/User.ts
+++ b/backend/src/typeorm/entity/User.ts
@@ -1,7 +1,7 @@
 import { BaseEntity, Entity, PrimaryGeneratedColumn, Column } from 'typeorm'
 
 // import { Group } from "./Group"
-@Entity()
+@Entity('state_users')
 export class User extends BaseEntity {
   @PrimaryGeneratedColumn()
   id: number
@@ -9,16 +9,16 @@ export class User extends BaseEntity {
   //   @ManyToOne(type => Group, group => group.users)
   //    group: Group;
 
-  @Column({ type: 'binary', length: 32 })
+  @Column({ type: 'binary', length: 32, name: 'public_key' })
   pubkey: Buffer
 
   @Column()
   email: string
 
-  @Column()
+  @Column({ name: 'first_name' })
   firstName: string
 
-  @Column()
+  @Column({ name: 'last_name' })
   lastName: string
 
   @Column()
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 4a1e80946..afaf4433c 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -166,6 +166,11 @@
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea"
   integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==
 
+"@sqltools/formatter@^1.2.2":
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/@sqltools/formatter/-/formatter-1.2.3.tgz#1185726610acc37317ddab11c3c7f9066966bd20"
+  integrity sha512-O3uyB/JbkAEMZaP3YqyHH7TMnex7tWyCbCI4EfJdOCoN6HIhqdJBWTM6aCCiWQ/5f5wxjgU735QAIpJbjDvmzg==
+
 "@szmarczak/http-timer@^1.1.2":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421"
@@ -396,6 +401,11 @@
   dependencies:
     "@types/node" "*"
 
+"@types/zen-observable@0.8.3":
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/@types/zen-observable/-/zen-observable-0.8.3.tgz#781d360c282436494b32fe7d9f7f8e64b3118aa3"
+  integrity sha512-fbF6oTd4sGGy0xjHPKAt+eS2CrxJ3+6gQ3FGcBoIJR2TLAyCkCyI8JqZNy+FeON0AhVgNJoUumVoZQjBFUqHkw==
+
 "@typescript-eslint/eslint-plugin@^4.28.0":
   version "4.28.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.28.0.tgz#1a66f03b264844387beb7dc85e1f1d403bd1803f"
@@ -527,6 +537,11 @@ ansi-colors@^4.1.1:
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
   integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
 
+ansi-regex@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+  integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
+
 ansi-regex@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
@@ -537,6 +552,11 @@ ansi-regex@^5.0.0:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
   integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
 
+ansi-styles@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
+  integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
+
 ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
@@ -551,6 +571,11 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
   dependencies:
     color-convert "^2.0.1"
 
+any-promise@^1.0.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
+  integrity sha1-q8av7tzqUugJzcA3au0845Y10X8=
+
 anymatch@~3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"
@@ -709,6 +734,11 @@ apollo-utilities@^1.0.1, apollo-utilities@^1.3.0:
     ts-invariant "^0.4.0"
     tslib "^1.10.0"
 
+app-root-path@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-3.0.0.tgz#210b6f43873227e18a4b810a032283311555d5ad"
+  integrity sha512-qMcx+Gy2UZynHjOHOIXPNvpf+9cjvk3cWrBBK7zg4gH9+clobJRb9NGzcT7mQTcV/6Gm/1WelUtqxVXnNlrwcw==
+
 arg@^4.1.0:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
@@ -721,6 +751,11 @@ argparse@^1.0.7:
   dependencies:
     sprintf-js "~1.0.2"
 
+argparse@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
+  integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
+
 array-flatten@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
@@ -780,6 +815,11 @@ balanced-match@^1.0.0:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
+base64-js@^1.3.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
+  integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
+
 binary-extensions@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
@@ -840,6 +880,14 @@ buffer-from@^1.0.0:
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
   integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
 
+buffer@^6.0.3:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-6.0.3.tgz#2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6"
+  integrity sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==
+  dependencies:
+    base64-js "^1.3.1"
+    ieee754 "^1.2.1"
+
 busboy@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/busboy/-/busboy-0.3.1.tgz#170899274c5bf38aae27d5c62b71268cd585fd1b"
@@ -883,6 +931,17 @@ camelcase@^5.3.1:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
+chalk@^1.1.1:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
+  integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
+  dependencies:
+    ansi-styles "^2.2.1"
+    escape-string-regexp "^1.0.2"
+    has-ansi "^2.0.0"
+    strip-ansi "^3.0.0"
+    supports-color "^2.0.0"
+
 chalk@^2.0.0:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
@@ -908,6 +967,14 @@ chalk@^4.0.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
+chalk@^4.1.0:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
+  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
 chokidar@^3.2.2:
   version "3.5.2"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.2.tgz#dba3976fcadb016f66fd365021d91600d01c1e75"
@@ -942,6 +1009,27 @@ cli-boxes@^2.2.0:
   resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f"
   integrity sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==
 
+cli-highlight@^2.1.11:
+  version "2.1.11"
+  resolved "https://registry.yarnpkg.com/cli-highlight/-/cli-highlight-2.1.11.tgz#49736fa452f0aaf4fae580e30acb26828d2dc1bf"
+  integrity sha512-9KDcoEVwyUXrjcJNvHD0NFc/hiwe/WPVYIleQh2O1N2Zro5gWJZ/K+3DGn8w8P/F6FxOgzyC5bxDyHIgCSPhGg==
+  dependencies:
+    chalk "^4.0.0"
+    highlight.js "^10.7.1"
+    mz "^2.4.0"
+    parse5 "^5.1.1"
+    parse5-htmlparser2-tree-adapter "^6.0.0"
+    yargs "^16.0.0"
+
+cliui@^7.0.2:
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
+  integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==
+  dependencies:
+    string-width "^4.2.0"
+    strip-ansi "^6.0.0"
+    wrap-ansi "^7.0.0"
+
 clone-response@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b"
@@ -1169,6 +1257,11 @@ dotenv@^10.0.0:
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-10.0.0.tgz#3d4227b8fb95f81096cdd2b66653fb2c7085ba81"
   integrity sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==
 
+dotenv@^8.2.0:
+  version "8.6.0"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.6.0.tgz#061af664d19f7f4d8fc6e4ff9b584ce237adcb8b"
+  integrity sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==
+
 duplexer3@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
@@ -1253,6 +1346,11 @@ es-to-primitive@^1.2.1:
     is-date-object "^1.0.1"
     is-symbol "^1.0.2"
 
+escalade@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
+  integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
+
 escape-goat@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/escape-goat/-/escape-goat-2.1.1.tgz#1b2dc77003676c457ec760b2dc68edb648188675"
@@ -1263,7 +1361,7 @@ escape-html@~1.0.3:
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
   integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
 
-escape-string-regexp@^1.0.5:
+escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
@@ -1557,6 +1655,11 @@ fastq@^1.6.0:
   dependencies:
     reusify "^1.0.4"
 
+figlet@^1.1.1:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/figlet/-/figlet-1.5.2.tgz#dda34ff233c9a48e36fcff6741aeb5bafe49b634"
+  integrity sha512-WOn21V8AhyE1QqVfPIVxe3tupJacq1xGkPTB4iagT6o+P2cAgEOOwIxMftr4+ZCTI6d551ij9j61DFr0nsP2uQ==
+
 file-entry-cache@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
@@ -1658,6 +1761,11 @@ generate-function@^2.3.1:
   dependencies:
     is-property "^1.0.2"
 
+get-caller-file@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
+  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
+
 get-intrinsic@^1.0.2, get-intrinsic@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6"
@@ -1794,6 +1902,13 @@ graphql@^15.5.1:
   resolved "https://registry.yarnpkg.com/graphql/-/graphql-15.5.1.tgz#f2f84415d8985e7b84731e7f3536f8bb9d383aad"
   integrity sha512-FeTRX67T3LoE3LWAxxOlW2K3Bz+rMYAC18rRguK4wgXaTZMiJwSUwDmPFo3UadAKbzirKIg5Qy+sNJXbpPRnQw==
 
+has-ansi@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
+  integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=
+  dependencies:
+    ansi-regex "^2.0.0"
+
 has-bigints@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113"
@@ -1826,6 +1941,11 @@ has@^1.0.3:
   dependencies:
     function-bind "^1.1.1"
 
+highlight.js@^10.7.1:
+  version "10.7.3"
+  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.7.3.tgz#697272e3991356e40c3cac566a74eef681756531"
+  integrity sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==
+
 hosted-git-info@^2.1.4:
   version "2.8.9"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
@@ -1883,6 +2003,11 @@ iconv-lite@^0.6.2:
   dependencies:
     safer-buffer ">= 2.1.2 < 3.0.0"
 
+ieee754@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
+  integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
+
 ignore-by-default@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/ignore-by-default/-/ignore-by-default-1.0.1.tgz#48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09"
@@ -2115,6 +2240,13 @@ js-yaml@^3.13.1:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
+js-yaml@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
+  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
+  dependencies:
+    argparse "^2.0.1"
+
 json-buffer@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"
@@ -2394,6 +2526,11 @@ minimist@^1.2.0:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
   integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
 
+mkdirp@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
+  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
+
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
@@ -2428,6 +2565,15 @@ mysql2@^2.3.0:
     seq-queue "^0.0.5"
     sqlstring "^2.3.2"
 
+mz@^2.4.0:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32"
+  integrity sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==
+  dependencies:
+    any-promise "^1.0.0"
+    object-assign "^4.0.1"
+    thenify-all "^1.0.0"
+
 named-placeholders@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/named-placeholders/-/named-placeholders-1.1.2.tgz#ceb1fbff50b6b33492b5cf214ccf5e39cef3d0e8"
@@ -2493,7 +2639,7 @@ normalize-url@^4.1.0:
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a"
   integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==
 
-object-assign@^4:
+object-assign@^4, object-assign@^4.0.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
@@ -2608,6 +2754,11 @@ parent-module@^1.0.0:
   dependencies:
     callsites "^3.0.0"
 
+parent-require@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/parent-require/-/parent-require-1.0.0.tgz#746a167638083a860b0eef6732cb27ed46c32977"
+  integrity sha1-dGoWdjgIOoYLDu9nMssn7UbDKXc=
+
 parse-json@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
@@ -2616,6 +2767,23 @@ parse-json@^4.0.0:
     error-ex "^1.3.1"
     json-parse-better-errors "^1.0.1"
 
+parse5-htmlparser2-tree-adapter@^6.0.0:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz#2cdf9ad823321140370d4dbf5d3e92c7c8ddc6e6"
+  integrity sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==
+  dependencies:
+    parse5 "^6.0.1"
+
+parse5@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz#f68e4e5ba1852ac2cadc00f4555fff6c2abb6178"
+  integrity sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==
+
+parse5@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b"
+  integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==
+
 parseurl@^1.3.2, parseurl@~1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
@@ -2830,6 +2998,11 @@ registry-url@^5.0.0:
   dependencies:
     rc "^1.2.8"
 
+require-directory@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
+  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
+
 require-from-string@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
@@ -2894,6 +3067,11 @@ safe-buffer@^5.0.1:
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
+sax@>=0.6.0:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
+  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
+
 semver-diff@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz#05f77ce59f325e00e2706afd67bb506ddb1ca32b"
@@ -3094,6 +3272,13 @@ string.prototype.trimstart@^1.0.4:
     call-bind "^1.0.2"
     define-properties "^1.1.3"
 
+strip-ansi@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
+  integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
+  dependencies:
+    ansi-regex "^2.0.0"
+
 strip-ansi@^5.1.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
@@ -3134,6 +3319,11 @@ subscriptions-transport-ws@^0.9.19:
     symbol-observable "^1.0.4"
     ws "^5.2.0 || ^6.0.0 || ^7.0.0"
 
+supports-color@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
+  integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
+
 supports-color@^5.3.0, supports-color@^5.5.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
@@ -3175,6 +3365,20 @@ text-table@^0.2.0:
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
   integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
 
+thenify-all@^1.0.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726"
+  integrity sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY=
+  dependencies:
+    thenify ">= 3.1.0 < 4"
+
+"thenify@>= 3.1.0 < 4":
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/thenify/-/thenify-3.3.1.tgz#8932e686a4066038a016dd9e2ca46add9838a95f"
+  integrity sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==
+  dependencies:
+    any-promise "^1.0.0"
+
 to-readable-stream@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771"
@@ -3295,6 +3499,29 @@ typedarray-to-buffer@^3.1.5:
   dependencies:
     is-typedarray "^1.0.0"
 
+typeorm@^0.2.37:
+  version "0.2.37"
+  resolved "https://registry.yarnpkg.com/typeorm/-/typeorm-0.2.37.tgz#1a5e59216077640694d27c04c99ed3f968d15dc8"
+  integrity sha512-7rkW0yCgFC24I5T0f3S/twmLSuccPh1SQmxET/oDWn2sSDVzbyWdnItSdKy27CdJGTlKHYtUVeOcMYw5LRsXVw==
+  dependencies:
+    "@sqltools/formatter" "^1.2.2"
+    app-root-path "^3.0.0"
+    buffer "^6.0.3"
+    chalk "^4.1.0"
+    cli-highlight "^2.1.11"
+    debug "^4.3.1"
+    dotenv "^8.2.0"
+    glob "^7.1.6"
+    js-yaml "^4.0.0"
+    mkdirp "^1.0.4"
+    reflect-metadata "^0.1.13"
+    sha.js "^2.4.11"
+    tslib "^2.1.0"
+    xml2js "^0.4.23"
+    yargonaut "^1.1.4"
+    yargs "^17.0.1"
+    zen-observable-ts "^1.0.0"
+
 typescript@^4.3.4:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.4.tgz#3f85b986945bcf31071decdd96cf8bfa65f9dcbc"
@@ -3441,6 +3668,15 @@ word-wrap@^1.2.3:
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
   integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
 
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
@@ -3466,6 +3702,19 @@ xdg-basedir@^4.0.0:
   resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13"
   integrity sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==
 
+xml2js@^0.4.23:
+  version "0.4.23"
+  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.23.tgz#a0c69516752421eb2ac758ee4d4ccf58843eac66"
+  integrity sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==
+  dependencies:
+    sax ">=0.6.0"
+    xmlbuilder "~11.0.0"
+
+xmlbuilder@~11.0.0:
+  version "11.0.1"
+  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3"
+  integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==
+
 xss@^1.0.8:
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/xss/-/xss-1.0.9.tgz#3ffd565571ff60d2e40db7f3b80b4677bec770d2"
@@ -3474,6 +3723,11 @@ xss@^1.0.8:
     commander "^2.20.3"
     cssfilter "0.0.10"
 
+y18n@^5.0.5:
+  version "5.0.8"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
+  integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
+
 yallist@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
@@ -3484,6 +3738,46 @@ yallist@^4.0.0:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
   integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
 
+yargonaut@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/yargonaut/-/yargonaut-1.1.4.tgz#c64f56432c7465271221f53f5cc517890c3d6e0c"
+  integrity sha512-rHgFmbgXAAzl+1nngqOcwEljqHGG9uUZoPjsdZEs1w5JW9RXYzrSvH/u70C1JE5qFi0qjsdhnUX/dJRpWqitSA==
+  dependencies:
+    chalk "^1.1.1"
+    figlet "^1.1.1"
+    parent-require "^1.0.0"
+
+yargs-parser@^20.2.2:
+  version "20.2.9"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
+  integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
+
+yargs@^16.0.0:
+  version "16.2.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
+  integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==
+  dependencies:
+    cliui "^7.0.2"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
+    require-directory "^2.1.1"
+    string-width "^4.2.0"
+    y18n "^5.0.5"
+    yargs-parser "^20.2.2"
+
+yargs@^17.0.1:
+  version "17.2.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.2.0.tgz#ec529632b2cb9044f3927f4b45f9cc4ae2535653"
+  integrity sha512-UPeZv4h9Xv510ibpt5rdsUNzgD78nMa1rhxxCgvkKiq06hlKCEHJLiJ6Ub8zDg/wR6hedEI6ovnd2vCvJ4nusA==
+  dependencies:
+    cliui "^7.0.2"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
+    require-directory "^2.1.1"
+    string-width "^4.2.0"
+    y18n "^5.0.5"
+    yargs-parser "^20.2.2"
+
 yn@3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
@@ -3497,7 +3791,15 @@ zen-observable-ts@^0.8.21:
     tslib "^1.9.3"
     zen-observable "^0.8.0"
 
-zen-observable@^0.8.0:
+zen-observable-ts@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-1.1.0.tgz#2d1aa9d79b87058e9b75698b92791c1838551f83"
+  integrity sha512-1h4zlLSqI2cRLPJUHJFL8bCWHhkpuXkF+dbGkRaWjgDIG26DmzyshUMrdV/rL3UnR+mhaX4fRq8LPouq0MYYIA==
+  dependencies:
+    "@types/zen-observable" "0.8.3"
+    zen-observable "0.8.15"
+
+zen-observable@0.8.15, zen-observable@^0.8.0:
   version "0.8.15"
   resolved "https://registry.yarnpkg.com/zen-observable/-/zen-observable-0.8.15.tgz#96415c512d8e3ffd920afd3889604e30b9eaac15"
   integrity sha512-PQ2PC7R9rslx84ndNBZB/Dkv8V8fZEpk83RLgXtYd0fwUgEjseMn1Dgajh2x6S8QbZAFa9p2qVCEuYZNgve0dQ==
diff --git a/community_server/src/Controller/AppController.php b/community_server/src/Controller/AppController.php
index 2c4b2b5e5..e70b8e7bd 100644
--- a/community_server/src/Controller/AppController.php
+++ b/community_server/src/Controller/AppController.php
@@ -223,22 +223,22 @@ class AppController extends Controller
                                 $public_key_bin = hex2bin($json['user']['public_hex']);
                                 $stateUserQuery = $stateUserTable
                                 ->find('all')
-                                ->where(['pubkey' => $public_key_bin])
+                                ->where(['public_key' => $public_key_bin])
                                 ->contain('StateBalances', function ($q) {
                                             return $q->order(['record_date' => 'DESC'])
                                                      ->limit(1);
                                         });
                                 if ($stateUserQuery->count() == 1) {
                                     $stateUser = $stateUserQuery->first();
-                                    if ($stateUser->firstName != $json['user']['first_name'] ||
-                                        $stateUser->lastName  != $json['user']['last_name'] ||
+                                    if ($stateUser->first_name != $json['user']['first_name'] ||
+                                        $stateUser->last_name  != $json['user']['last_name'] ||
                                         $stateUser->disabled  != $json['user']['disabled'] ||
                                         //$stateUser->username  != $json['user']['username'] ||
                                         // -> throws error
                                         $stateUser->email      != $json['user']['email']
                                     ) {
-                                        $stateUser->firstName = $json['user']['first_name'];
-                                        $stateUser->lastName = $json['user']['last_name'];
+                                        $stateUser->first_name = $json['user']['first_name'];
+                                        $stateUser->last_name = $json['user']['last_name'];
                                         $stateUser->disabled = intval($json['user']['disabled']);
                                         //$stateUser->username = $json['user']['username'];
                                         $stateUser->email = $json['user']['email'];
@@ -250,9 +250,9 @@ class AppController extends Controller
                               //echo $stateUser['id'];
                                 } else {
                                     $newStateUser = $stateUserTable->newEntity();
-                                    $newStateUser->pubkey = $public_key_bin;
-                                    $newStateUser->firstName = $json['user']['first_name'];
-                                    $newStateUser->lastName = $json['user']['last_name'];
+                                    $newStateUser->public_key = $public_key_bin;
+                                    $newStateUser->first_name = $json['user']['first_name'];
+                                    $newStateUser->last_name = $json['user']['last_name'];
                                     $newStateUser->disabled = intval($json['user']['disabled']);
                                     //$newStateUser->username = $json['user']['username'];
                                     $newStateUser->email = $json['user']['email'];
diff --git a/community_server/src/Controller/JsonRequestHandlerController.php b/community_server/src/Controller/JsonRequestHandlerController.php
index 150cce4ae..611984118 100644
--- a/community_server/src/Controller/JsonRequestHandlerController.php
+++ b/community_server/src/Controller/JsonRequestHandlerController.php
@@ -308,7 +308,7 @@ class JsonRequestHandlerController extends AppController {
       $stateError = $stateErrorTable->newEntity();
       //
       $pubkey = hex2bin($jsonData->public_key);
-      $user_query = $stateUsersTable->find('all')->select(['id'])->where(['pubkey' => $pubkey]);
+      $user_query = $stateUsersTable->find('all')->select(['id'])->where(['public_key' => $pubkey]);
       if($user_query->count() != 1) {
         return $this->returnJson(['state' => 'error', 'msg' => 'user not found', 'details' => 'user pubkey hex:' . $jsonData->public_key]);
       }
@@ -412,7 +412,7 @@ class JsonRequestHandlerController extends AppController {
       //$pubkeys->sender
       //$pubkeys->receiver
       $stateUserTable = TableRegistry::getTableLocator()->get('StateUsers');
-      $user = $stateUserTable->find('all')->where(['pubkey' => hex2bin($pubkeys->sender)])->contain(['StateBalances']);
+      $user = $stateUserTable->find('all')->where(['public_key' => hex2bin($pubkeys->sender)])->contain(['StateBalances']);
       if(!$user->count()) {
         return $this->returnJson(['state' => 'not found', 'msg' => 'user not found or empty balance']);
       }
@@ -461,7 +461,7 @@ class JsonRequestHandlerController extends AppController {
     
     private function userDelete($userPubkeyHex) {
       $stateUserTable = TableRegistry::getTableLocator()->get('StateUsers');
-      $user = $stateUserTable->find('all')->where(['pubkey' => hex2bin($userPubkeyHex)]);
+      $user = $stateUserTable->find('all')->where(['public_key' => hex2bin($userPubkeyHex)]);
       if(!$user || $user->count == 0) {
         return $this->returnJson(['state' => 'error', 'msg' => 'user not found']);
       }
diff --git a/community_server/src/Controller/StateUserRolesController.php b/community_server/src/Controller/StateUserRolesController.php
index 80b168f35..9238c7ad6 100644
--- a/community_server/src/Controller/StateUserRolesController.php
+++ b/community_server/src/Controller/StateUserRolesController.php
@@ -132,7 +132,7 @@ class StateUserRolesController extends AppController
 
             $public_hex = hex2bin($requestData['public_hex']);
 
-            $stateUser = $this->StateUsers->find('all')->where(['pubkey' => $public_hex])->first();
+            $stateUser = $this->StateUsers->find('all')->where(['public_key' => $public_hex])->first();
 
             foreach($requestData['role_id'] as $role_id)
             {
@@ -158,7 +158,7 @@ class StateUserRolesController extends AppController
 
         $publichex = hex2bin($public_hex);
 
-        $stateUser = $this->StateUsers->find('all')->where(['pubkey' => $publichex])->first();
+        $stateUser = $this->StateUsers->find('all')->where(['public_key' => $publichex])->first();
 
         $stateUserRoles = $this->StateUserRoles->find('all')->where(['state_user_id' => $stateUser->id])->all();
 
diff --git a/community_server/src/Controller/StateUsersController.php b/community_server/src/Controller/StateUsersController.php
index 25171f462..fc6ec8614 100644
--- a/community_server/src/Controller/StateUsersController.php
+++ b/community_server/src/Controller/StateUsersController.php
@@ -182,15 +182,15 @@ class StateUsersController extends AppController
 
                 if($account_state == 'email not activated') {
                     if(count($pubkeySorted) > 0) {
-                        $communityUsers->where(['hex(pubkey) IN' => array_keys($pubkeySorted)]);
+                        $communityUsers->where(['hex(public_key) IN' => array_keys($pubkeySorted)]);
                     } else {
                         $communityUsers = null;
                     }
                 } else {
                     $globalSearch = '%' . $searchString . '%';
             $communityUsers->where(['OR' => [
-                  'firstName LIKE' => $globalSearch,
-                  'lastName  LIKE' => $globalSearch,
+                  'first_name LIKE' => $globalSearch,
+                  'last_name  LIKE' => $globalSearch,
                   'email      LIKE' => $globalSearch
             ]]);
                 }
@@ -199,7 +199,7 @@ class StateUsersController extends AppController
             //var_dump($communityUsers->toArray());
                 if($communityUsers) {
             foreach($communityUsers as $u) {
-              $pubkey_hex = bin2hex(stream_get_contents($u->pubkey));
+              $pubkey_hex = bin2hex(stream_get_contents($u->public_key));
               $u->public_hex = $pubkey_hex;
               if(!isset($pubkeySorted[$pubkey_hex])) {
                 $pubkeySorted[$pubkey_hex] = ['login' => [], 'community' => []];
@@ -229,9 +229,9 @@ class StateUsersController extends AppController
                 $color = 'danger';
                 if(count($user['community']) == 1) {
                   $c_user = $user['community'][0];
-                  $finalUser['name'] = $c_user->firstName . ' ' . $c_user->lastName;
-                  $finalUser['first_name'] = $c_user->firstName;
-                  $finalUser['last_name'] = $c_user->lastName;
+                  $finalUser['name'] = $c_user->first_name . ' ' . $c_user->last_name;
+                  $finalUser['first_name'] = $c_user->first_name;
+                  $finalUser['last_name'] = $c_user->last_name;
                   $finalUser['email'] = $c_user->email;
                 }
               } else if(count($user['login']) == 1) {
@@ -415,7 +415,7 @@ class StateUsersController extends AppController
           //$user = $jsonData['user'];
           //var_dump($jsonData);
           $pubkey = hex2bin($jsonData['pubkeyhex']);
-          $stateUsers = $this->StateUsers->find('all')->where(['pubkey' => $pubkey]);
+          $stateUsers = $this->StateUsers->find('all')->where(['public_key' => $pubkey]);
           if($stateUsers->count() != 1) {
             return $this->returnJson(['state' => 'error', 'msg' => 'invalid result count']);
           }
@@ -448,7 +448,7 @@ class StateUsersController extends AppController
           $pubkey = hex2bin($jsonData['pubkeyhex']);
           $stateUsers = $this->StateUsers
                   ->find('all')
-                  ->where(['pubkey' => $pubkey])
+                  ->where(['public_key' => $pubkey])
                   ->select(['id']);
           if($stateUsers->count() != 1) {
             return $this->returnJson(['state' => 'error', 'msg' => 'invalid result count']);
diff --git a/community_server/src/Controller/TransactionCreationsController.php b/community_server/src/Controller/TransactionCreationsController.php
index f024e5cb4..d02320d25 100644
--- a/community_server/src/Controller/TransactionCreationsController.php
+++ b/community_server/src/Controller/TransactionCreationsController.php
@@ -101,7 +101,7 @@ class TransactionCreationsController extends AppController
         $receiverProposal = [];
         foreach ($stateUsers as $stateUser) {
             $name = $stateUser->email;
-            $keyHex = bin2hex(stream_get_contents($stateUser->pubkey));
+            $keyHex = bin2hex(stream_get_contents($stateUser->public_key));
             if ($name === null) {
                 $name = $stateUser->first_name . ' ' . $stateUser->last_name;
             }
@@ -241,14 +241,14 @@ class TransactionCreationsController extends AppController
             $this->log("search for text: ".$requestData['searchText'], 'debug');
             $stateUsers = $stateUserTable
                 ->find('all')
-                ->select(['id', 'firstName', 'lastName', 'email'])
-                ->order(['firstName', 'lastName'])
+                ->select(['id', 'first_name', 'last_name', 'email'])
+                ->order(['first_name', 'last_name'])
                 ->where(
                     ['AND' => [
                         'disabled' => 0,
                             'OR' => [
-                                      'LOWER(firstName) LIKE' => '%'.strtolower($requestData['searchText']).'%',
-                                      'LOWER(lastName) LIKE' => '%'.strtolower($requestData['searchText']).'%',
+                                      'LOWER(first_name) LIKE' => '%'.strtolower($requestData['searchText']).'%',
+                                      'LOWER(last_name) LIKE' => '%'.strtolower($requestData['searchText']).'%',
                                       'LOWER(email) LIKE' => '%'.strtolower($requestData['searchText']).'%'
                                     ]
                                 ]
@@ -265,10 +265,10 @@ class TransactionCreationsController extends AppController
         } else {
             $stateUsers = $stateUserTable
                 ->find('all')
-                ->select(['id', 'firstName', 'lastName', 'email'])
+                ->select(['id', 'first_name', 'last_name', 'email'])
                 //->order(['id'])
 				->where(['disabled' => 0])
-                ->order(['firstName', 'lastName'])
+                ->order(['first_name', 'last_name'])
                 ->contain(['TransactionCreations' => [
                     'fields' => [
                         'TransactionCreations.amount',
@@ -300,7 +300,7 @@ class TransactionCreationsController extends AppController
 
           //if($sumAmount < 20000000) {
             array_push($possibleReceivers, [
-                'name' => $stateUser->firstName . '&nbsp;' . $stateUser->lastName,
+                'name' => $stateUser->first_name . '&nbsp;' . $stateUser->last_name,
                 'id' => $stateUser->id,
                 'email' => $stateUser->email,
                 'amount' => $sumAmount,
@@ -353,7 +353,7 @@ class TransactionCreationsController extends AppController
                 }
                 $receiverUsers = $stateUserTable->find('all')
                                                 ->where(['id IN' => array_keys($users)])
-                                                ->select(['pubkey', 'email', 'id'])
+                                                ->select(['public_key', 'email', 'id'])
                                                 ->contain(false);
                 
                 foreach ($receiverUsers as $receiverUser) {
@@ -371,7 +371,7 @@ class TransactionCreationsController extends AppController
                     } else {
                         $pendings[$id] = $localAmountCent;
                     }
-                    $pubKeyHex = bin2hex(stream_get_contents($receiverUser->pubkey));
+                    $pubKeyHex = bin2hex(stream_get_contents($receiverUser->public_key));
                     $requestAnswear = $this->JsonRequestClient->sendRequest(json_encode([
                         'session_id' => $session->read('session_id'),
                         'email' => $receiverUser->email,
diff --git a/community_server/src/Model/Entity/StateUser.php b/community_server/src/Model/Entity/StateUser.php
index 374e8d608..5fac7cda7 100644
--- a/community_server/src/Model/Entity/StateUser.php
+++ b/community_server/src/Model/Entity/StateUser.php
@@ -30,14 +30,16 @@ class StateUser extends Entity
      * @var array
      */
     protected $_accessible = [
-        'groupId' => true,
-        'pubkey' => true,
+        'index_id' => true,
+        'state_group_id' => true,
+        'public_key' => true,
         'email' => true,
-        'firstName' => true,
-        'lastName' => true,
+        'first_name' => true,
+        'last_name' => true,
         'disabled' => true,
         'username' => true,
         'index' => true,
+        'state_group' => true,
         'state_balances' => true,
         'state_created' => true,
         'transaction_creations' => true,
@@ -46,11 +48,11 @@ class StateUser extends Entity
 
     public function getEmailWithName()
     {
-        return $this->firstName . ' ' . $this->lastName . ' <' . $this->email . '>';
+        return $this->first_name . ' ' . $this->last_name . ' <' . $this->email . '>';
     }
 
     public function getNames()
     {
-        return $this->firstName . ' ' . $this->lastName;
+        return $this->first_name . ' ' . $this->last_name;
     }
 }
diff --git a/community_server/src/Model/Table/AdminErrorsTable.php b/community_server/src/Model/Table/AdminErrorsTable.php
index 7074921b5..e6263d8ff 100644
--- a/community_server/src/Model/Table/AdminErrorsTable.php
+++ b/community_server/src/Model/Table/AdminErrorsTable.php
@@ -40,7 +40,7 @@ class AdminErrorsTable extends Table
 
         $this->addBehavior('Timestamp');
 
-        $this->belongsTo('User', [
+        $this->belongsTo('StateUsers', [
             'foreignKey' => 'state_user_id',
             'joinType' => 'INNER'
         ]);
@@ -100,7 +100,7 @@ class AdminErrorsTable extends Table
      */
     public function buildRules(RulesChecker $rules)
     {
-        $rules->add($rules->existsIn(['state_user_id'], 'User'));
+        $rules->add($rules->existsIn(['state_user_id'], 'StateUsers'));
 
         return $rules;
     }
diff --git a/community_server/src/Model/Table/StateUsersTable.php b/community_server/src/Model/Table/StateUsersTable.php
index 729b7800a..5b01609f3 100644
--- a/community_server/src/Model/Table/StateUsersTable.php
+++ b/community_server/src/Model/Table/StateUsersTable.php
@@ -37,10 +37,18 @@ class StateUsersTable extends Table
     {
         parent::initialize($config);
 
-        $this->setTable('user');
+        $this->setTable('state_users');
         $this->setDisplayField('email');
         $this->setPrimaryKey('id');
 
+        /*$this->belongsTo('Indices', [
+            'foreignKey' => 'index_id',
+            'joinType' => 'INNER'
+        ]);*/
+        $this->belongsTo('StateGroups', [
+            'foreignKey' => 'state_group_id',
+            'joinType' => 'INNER'
+        ]);
         $this->hasMany('StateBalances', [
             'foreignKey' => 'state_user_id'
         ]);
@@ -72,8 +80,8 @@ class StateUsersTable extends Table
             ->allowEmptyString('id', null, 'create');
 
         $validator
-            ->requirePresence('pubkey', 'create')
-            ->notEmptyString('pubkey');
+            ->requirePresence('public_key', 'create')
+            ->notEmptyString('public_key');
 
         return $validator;
     }
@@ -116,7 +124,7 @@ class StateUsersTable extends Table
         $involvedUser = $this->find('all', [
             'contain' => [],
             'where' => ['id IN' => $involvedUserIds],
-            'fields' => ['id', 'firstName', 'lastName', 'email'],
+            'fields' => ['id', 'first_name', 'last_name', 'email'],
           ]);
         //var_dump($involvedUser->toArray());
         $involvedUserIndices = [];
diff --git a/community_server/src/Model/Transactions/TransactionBase.php b/community_server/src/Model/Transactions/TransactionBase.php
index 8c2709a96..6b3817201 100644
--- a/community_server/src/Model/Transactions/TransactionBase.php
+++ b/community_server/src/Model/Transactions/TransactionBase.php
@@ -49,13 +49,13 @@ class TransactionBase {
     protected function getStateUserId($publicKey) {
       
       $stateUsersTable = self::getTable('state_users');
-      $stateUser = $stateUsersTable->find('all')->select(['id'])->where(['pubkey' => $publicKey])->first();
+      $stateUser = $stateUsersTable->find('all')->select(['id'])->where(['public_key' => $publicKey])->first();
       if($stateUser) {
         return $stateUser->id;
       }
       // create new entry
       $stateUserEntity = $stateUsersTable->newEntity();
-      $stateUserEntity->pubkey = $publicKey;
+      $stateUserEntity->public_key = $publicKey;
       if($stateUsersTable->save($stateUserEntity)) {
         return $stateUserEntity->id;
       } else {
@@ -77,7 +77,7 @@ class TransactionBase {
     
     protected function getStateUserFromPublickey($publicKey) {
         $stateUsersTable = self::getTable('state_users');
-        $stateUser = $stateUsersTable->find('all')->where(['pubkey' => $publicKey])->first();
+        $stateUser = $stateUsersTable->find('all')->where(['public_key' => $publicKey])->first();
         if($stateUser) {
           return $stateUser;
         }
diff --git a/community_server/src/Model/Transactions/TransactionCreation.php b/community_server/src/Model/Transactions/TransactionCreation.php
index a8263c60d..87f2d2104 100644
--- a/community_server/src/Model/Transactions/TransactionCreation.php
+++ b/community_server/src/Model/Transactions/TransactionCreation.php
@@ -95,7 +95,7 @@ class TransactionCreation extends TransactionBase {
       $existingCreations2 = $this->transactionCreationsTable
               ->find('all')
               ->select(['amount', 'state_user_id', 'target_date'])
-              ->contain(['StateUsers' => ['fields' => ['StateUsers.pubkey']]]);
+              ->contain(['StateUsers' => ['fields' => ['StateUsers.public_key']]]);
       $q = $existingCreations2;
       $targetDate = $this->protoTransactionCreation->getTargetDate();
       
@@ -230,7 +230,7 @@ class TransactionCreation extends TransactionBase {
       
       
       $receiverAmount = new \Proto\Gradido\TransferAmount();
-      $receiverAmount->setPubkey(stream_get_contents($stateUser->pubkey));
+      $receiverAmount->setPubkey(stream_get_contents($stateUser->public_key));
       $receiverAmount->setAmount($transactionCreationEntity->amount);
       
       $protoCreation->setReceiver($receiverAmount);
diff --git a/community_server/src/Model/Transactions/TransactionTransfer.php b/community_server/src/Model/Transactions/TransactionTransfer.php
index 2bd470e73..dc1606f55 100644
--- a/community_server/src/Model/Transactions/TransactionTransfer.php
+++ b/community_server/src/Model/Transactions/TransactionTransfer.php
@@ -96,7 +96,7 @@ class TransactionTransfer extends TransactionBase {
         $user = $stateUsersTable
                   ->find('all')
                   ->select(['id'])
-                  ->where(['pubkey' => $senderPublic])
+                  ->where(['public_key' => $senderPublic])
                   ->contain(['StateBalances' => ['fields' => ['amount', 'state_user_id']]])->first();
         if(!$user) {
           $this->addError($functionName, 'couldn\'t find sender in db' );
@@ -114,7 +114,7 @@ class TransactionTransfer extends TransactionBase {
           return false;
         }
         // check if receiver exist
-        $receiver_user = $stateUsersTable->find('all')->select(['id'])->where(['pubkey' => $receiver_public_key])->first();
+        $receiver_user = $stateUsersTable->find('all')->select(['id'])->where(['public_key' => $receiver_public_key])->first();
         if(!$receiver_user) {
             $this->addError($functionName, 'couldn\'t find receiver in db' );
             return false;
diff --git a/community_server/tests/Fixture/UserFixture.php b/community_server/tests/Fixture/StateUsersFixture.php
similarity index 55%
rename from community_server/tests/Fixture/UserFixture.php
rename to community_server/tests/Fixture/StateUsersFixture.php
index 2e01cd9e3..a9b033bf7 100644
--- a/community_server/tests/Fixture/UserFixture.php
+++ b/community_server/tests/Fixture/StateUsersFixture.php
@@ -6,9 +6,8 @@ use Cake\TestSuite\Fixture\TestFixture;
 /**
  * StateUsersFixture
  */
-class UserFixture extends BaseTestFixture
+class StateUsersFixture extends BaseTestFixture
 {
-    public $import = [ 'model' => 'StateUsers', 'connection' => 'test' ];
     /**
      * Fields
      *
@@ -17,16 +16,17 @@ class UserFixture extends BaseTestFixture
     // @codingStandardsIgnoreStart
     public $fields = [
         'id' => ['type' => 'integer', 'length' => 10, 'unsigned' => true, 'null' => false, 'default' => null, 'comment' => '', 'autoIncrement' => true, 'precision' => null],
-        'groupId' => ['type' => 'integer', 'length' => 10, 'unsigned' => true, 'null' => false, 'default' => '0', 'comment' => '', 'precision' => null, 'autoIncrement' => null],
-        'pubkey' => ['type' => 'binary', 'length' => 32, 'null' => false, 'default' => null, 'comment' => '', 'precision' => null],
+        'index_id' => ['type' => 'smallinteger', 'length' => 6, 'unsigned' => false, 'null' => false, 'default' => '0', 'comment' => '', 'precision' => null],
+        'group_id' => ['type' => 'integer', 'length' => 10, 'unsigned' => true, 'null' => false, 'default' => '0', 'comment' => '', 'precision' => null, 'autoIncrement' => null],
+        'public_key' => ['type' => 'binary', 'length' => 32, 'null' => false, 'default' => null, 'comment' => '', 'precision' => null],
         'email' => ['type' => 'string', 'length' => 255, 'null' => true, 'default' => null, 'collate' => 'utf8mb4_unicode_ci', 'comment' => '', 'precision' => null, 'fixed' => null],
-        'firstNname' => ['type' => 'string', 'length' => 255, 'null' => true, 'default' => null, 'collate' => 'utf8mb4_unicode_ci', 'comment' => '', 'precision' => null, 'fixed' => null],
-        'lastName' => ['type' => 'string', 'length' => 255, 'null' => true, 'default' => null, 'collate' => 'utf8mb4_unicode_ci', 'comment' => '', 'precision' => null, 'fixed' => null],
+        'first_name' => ['type' => 'string', 'length' => 255, 'null' => true, 'default' => null, 'collate' => 'utf8mb4_unicode_ci', 'comment' => '', 'precision' => null, 'fixed' => null],
+        'last_name' => ['type' => 'string', 'length' => 255, 'null' => true, 'default' => null, 'collate' => 'utf8mb4_unicode_ci', 'comment' => '', 'precision' => null, 'fixed' => null],
         'username' => ['type' => 'string', 'length' => 255, 'null' => true, 'default' => null, 'collate' => 'utf8mb4_unicode_ci', 'comment' => '', 'precision' => null, 'fixed' => null],
         'disabled' => ['type' => 'tinyinteger', 'length' => 4, 'unsigned' => false, 'null' => true, 'default' => '0', 'comment' => '', 'precision' => null],
         '_constraints' => [
             'primary' => ['type' => 'primary', 'columns' => ['id'], 'length' => []],
-            'pubkey' => ['type' => 'unique', 'columns' => ['pubkey'], 'length' => []],
+            'public_key' => ['type' => 'unique', 'columns' => ['public_key'], 'length' => []],
         ],
         '_options' => [
             'engine' => 'InnoDB',
@@ -44,9 +44,9 @@ class UserFixture extends BaseTestFixture
     public function init()
     {
         $sql_entrys = [
-            [1, 0, 'f7f4a49a4ac10379f8b9ddcb731c4d9ec495e6edd16075f52672cd25e3179f0f', 'test1.gmail.de', 'Max', 'Mustermann', NULL, 0],
-            [3, 0, '131c7f68dd94b2be4c913400ff7ff4cdc03ac2bda99c2d29edcacb3b065c67e6', 'test2.gmail.com', 'Ines', 'Mustermann', NULL, 0],
-            [4, 0, 'e3369de3623ce8446d0424c4013e7a1d71a2671ae3d7bf1e798ebf0665d145f2', 'test3.yahoo.com', 'Samuel', 'Schmied', NULL, 0]
+            [1, 0, 0, 'f7f4a49a4ac10379f8b9ddcb731c4d9ec495e6edd16075f52672cd25e3179f0f', 'test1.gmail.de', 'Max', 'Mustermann', NULL, 0],
+            [3, 0, 0, '131c7f68dd94b2be4c913400ff7ff4cdc03ac2bda99c2d29edcacb3b065c67e6', 'test2.gmail.com', 'Ines', 'Mustermann', NULL, 0],
+            [4, 0, 0, 'e3369de3623ce8446d0424c4013e7a1d71a2671ae3d7bf1e798ebf0665d145f2', 'test3.yahoo.com', 'Samuel', 'Schmied', NULL, 0]
         ];
         $this->records = $this->sqlEntrysToRecords($sql_entrys, $this->fields);
         parent::init();
diff --git a/community_server/tests/TestCase/Controller/AdminErrorsControllerTest.php b/community_server/tests/TestCase/Controller/AdminErrorsControllerTest.php
index 04aee90fa..a9044b4ae 100644
--- a/community_server/tests/TestCase/Controller/AdminErrorsControllerTest.php
+++ b/community_server/tests/TestCase/Controller/AdminErrorsControllerTest.php
@@ -21,7 +21,7 @@ class AdminErrorsControllerTest extends TestCase
      */
     public $fixtures = [
         'app.AdminErrors',
-        'app.User'
+        'app.StateUsers'
     ];
 
     /**
diff --git a/community_server/tests/TestCase/Controller/JsonRequestHandlerControllerTest.php b/community_server/tests/TestCase/Controller/JsonRequestHandlerControllerTest.php
index 496e7e3c5..f990b3e57 100644
--- a/community_server/tests/TestCase/Controller/JsonRequestHandlerControllerTest.php
+++ b/community_server/tests/TestCase/Controller/JsonRequestHandlerControllerTest.php
@@ -21,7 +21,7 @@ class JsonRequestHandlerControllerTest extends TestCase
     public $fixtures = [
         'app.TransactionCreations',
         'app.Transactions',
-        'app.User',
+        'app.StateUsers',
         'app.StateUserTransactions',
         'app.StateErrors',
         'app.TransactionSignatures',
diff --git a/community_server/tests/TestCase/Controller/ProfilesControllerTest.php b/community_server/tests/TestCase/Controller/ProfilesControllerTest.php
index 77e2576ef..d87558e55 100644
--- a/community_server/tests/TestCase/Controller/ProfilesControllerTest.php
+++ b/community_server/tests/TestCase/Controller/ProfilesControllerTest.php
@@ -20,7 +20,7 @@ class ProfilesControllerTest extends TestCase
      * @var array
      */
     public $fixtures = [
-        'app.User',
+        'app.StateUsers',
         'app.CommunityProfiles',
     ];
 
diff --git a/community_server/tests/TestCase/Controller/StateBalancesControllerTest.php b/community_server/tests/TestCase/Controller/StateBalancesControllerTest.php
index f533f344e..9ef8d28e9 100644
--- a/community_server/tests/TestCase/Controller/StateBalancesControllerTest.php
+++ b/community_server/tests/TestCase/Controller/StateBalancesControllerTest.php
@@ -24,7 +24,7 @@ class StateBalancesControllerTest extends TestCase
     public $fixtures = [
         'app.TransactionCreations',
         'app.Transactions',
-        'app.User',
+        'app.StateUsers',
         'app.StateUserTransactions',
         'app.StateErrors',
         'app.TransactionSignatures',
diff --git a/community_server/tests/TestCase/Controller/StateErrorsControllerTest.php b/community_server/tests/TestCase/Controller/StateErrorsControllerTest.php
index df45ff59d..452af54fc 100644
--- a/community_server/tests/TestCase/Controller/StateErrorsControllerTest.php
+++ b/community_server/tests/TestCase/Controller/StateErrorsControllerTest.php
@@ -21,7 +21,7 @@ class StateErrorsControllerTest extends TestCase
      */
     public $fixtures = [
         'app.StateErrors',
-        'app.User',
+        'app.StateUsers',
         'app.TransactionTypes'
     ];
 
diff --git a/community_server/tests/TestCase/Controller/StateUserTransactionsControllerTest.php b/community_server/tests/TestCase/Controller/StateUserTransactionsControllerTest.php
index 39be9ec66..0c9e0a513 100644
--- a/community_server/tests/TestCase/Controller/StateUserTransactionsControllerTest.php
+++ b/community_server/tests/TestCase/Controller/StateUserTransactionsControllerTest.php
@@ -21,7 +21,7 @@ class StateUserTransactionsControllerTest extends TestCase
      */
     public $fixtures = [
         'app.StateUserTransactions',
-        'app.User',
+        'app.StateUsers',
         'app.Transactions',
         'app.TransactionTypes',
     ];
diff --git a/community_server/tests/TestCase/Controller/TransactionCreationsControllerTest.php b/community_server/tests/TestCase/Controller/TransactionCreationsControllerTest.php
index 7a34c52a5..74c0e4b1e 100644
--- a/community_server/tests/TestCase/Controller/TransactionCreationsControllerTest.php
+++ b/community_server/tests/TestCase/Controller/TransactionCreationsControllerTest.php
@@ -22,7 +22,7 @@ class TransactionCreationsControllerTest extends TestCase
     public $fixtures = [
         'app.TransactionCreations',
         'app.Transactions',
-        'app.User'
+        'app.StateUsers'
     ];
 
     /**
diff --git a/community_server/tests/TestCase/Model/Table/AdminErrorsTableTest.php b/community_server/tests/TestCase/Model/Table/AdminErrorsTableTest.php
index a258d9e25..09d7a35fb 100644
--- a/community_server/tests/TestCase/Model/Table/AdminErrorsTableTest.php
+++ b/community_server/tests/TestCase/Model/Table/AdminErrorsTableTest.php
@@ -24,7 +24,7 @@ class AdminErrorsTableTest extends TestCase
      */
     public $fixtures = [
         'app.AdminErrors',
-        'app.User'
+        'app.StateUsers'
     ];
 
     /**
diff --git a/community_server/tests/TestCase/Model/Table/StateBalancesTableTest.php b/community_server/tests/TestCase/Model/Table/StateBalancesTableTest.php
index c14b95c09..68049de34 100644
--- a/community_server/tests/TestCase/Model/Table/StateBalancesTableTest.php
+++ b/community_server/tests/TestCase/Model/Table/StateBalancesTableTest.php
@@ -24,7 +24,7 @@ class StateBalancesTableTest extends TestCase
      */
     public $fixtures = [
         'app.StateBalances',
-        'app.User',
+        'app.StateUsers',
     ];
 
     /**
diff --git a/community_server/tests/TestCase/Model/Table/StateErrorsTableTest.php b/community_server/tests/TestCase/Model/Table/StateErrorsTableTest.php
index d8633a56a..21cbe6128 100644
--- a/community_server/tests/TestCase/Model/Table/StateErrorsTableTest.php
+++ b/community_server/tests/TestCase/Model/Table/StateErrorsTableTest.php
@@ -24,7 +24,7 @@ class StateErrorsTableTest extends TestCase
      */
     public $fixtures = [
         'app.StateErrors',
-        'app.User',
+        'app.StateUsers',
         'app.TransactionTypes'
     ];
 
diff --git a/community_server/tests/TestCase/Model/Table/StateUserTransactionsTableTest.php b/community_server/tests/TestCase/Model/Table/StateUserTransactionsTableTest.php
index dccb91b4e..173ad8e12 100644
--- a/community_server/tests/TestCase/Model/Table/StateUserTransactionsTableTest.php
+++ b/community_server/tests/TestCase/Model/Table/StateUserTransactionsTableTest.php
@@ -24,7 +24,7 @@ class StateUserTransactionsTableTest extends TestCase
      */
     public $fixtures = [
         'app.StateUserTransactions',
-        'app.User',
+        'app.StateUsers',
         'app.Transactions',
         'app.TransactionTypes',
     ];
diff --git a/community_server/tests/TestCase/Model/Table/StateUsersTableTest.php b/community_server/tests/TestCase/Model/Table/StateUsersTableTest.php
index 803def3a7..49deb1166 100644
--- a/community_server/tests/TestCase/Model/Table/StateUsersTableTest.php
+++ b/community_server/tests/TestCase/Model/Table/StateUsersTableTest.php
@@ -23,7 +23,7 @@ class StateUsersTableTest extends TestCase
      * @var array
      */
     public $fixtures = [
-        'app.User',
+        'app.StateUsers',
         'app.StateGroups',
         'app.StateBalances',
         'app.StateCreated',
@@ -39,8 +39,8 @@ class StateUsersTableTest extends TestCase
     public function setUp()
     {
         parent::setUp();
-        $config = TableRegistry::getTableLocator()->exists('User') ? [] : ['className' => StateUsersTable::class];
-        $this->StateUsersTable = TableRegistry::getTableLocator()->get('User', $config);
+        $config = TableRegistry::getTableLocator()->exists('StateUsers') ? [] : ['className' => StateUsersTable::class];
+        $this->StateUsersTable = TableRegistry::getTableLocator()->get('StateUsers', $config);
     }
 
     /**
diff --git a/database/build/.env.dist b/database/build/.env.dist
new file mode 100644
index 000000000..505546e1b
--- /dev/null
+++ b/database/build/.env.dist
@@ -0,0 +1,2 @@
+// For production you need to put your env file in here.
+// Please copy the dist file from the root folder in here and rename it to .env
\ No newline at end of file
diff --git a/database/migrations/0002-update_user.ts b/database/migrations/0002-update_user.ts
deleted file mode 100644
index d23beab90..000000000
--- a/database/migrations/0002-update_user.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-/* FIRST MIGRATION
- *
- * This migration is special since it takes into account that
- * the database can be setup already but also may not be.
- * Therefore you will find all `CREATE TABLE` statements with
- * a `IF NOT EXISTS`, all `INSERT` with an `IGNORE` and in the
- * downgrade function all `DROP TABLE` with a `IF EXISTS`.
- * This ensures compatibility for existing or non-existing
- * databases.
- */
-
-export async function upgrade(queryFn: (query: string, values?: any[]) => Promise<Array<any>>) {
-  // write upgrade logic as parameter of queryFn
-
-  // rename table
-  await queryFn(`
-      ALTER TABLE state_users
-        RENAME TO user;
-    `)
-  // drop not used columns
-  await queryFn(`
-      ALTER TABLE user
-        DROP COLUMN index_id;
-    `)
-  // rename from snake case to camel case (cakePHP standard to typeorm standard)
-  await queryFn(`
-      ALTER TABLE user 
-        CHANGE COLUMN group_id groupId int(10) unsigned NOT NULL DEFAULT '0',
-        CHANGE COLUMN public_key pubkey binary(32) NOT NULL,
-        CHANGE COLUMN first_name firstName varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
-        CHANGE COLUMN last_name lastName varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL;
-    `)
-}
-
-export async function downgrade(queryFn: (query: string, values?: any[]) => Promise<Array<any>>) {
-  // write downgrade logic as parameter of queryFn
-  // rename table
-  await queryFn(`
-      ALTER TABLE user
-        RENAME TO state_users;
-    `)
-  // put back dropped column
-  await queryFn(`
-      ALTER TABLE state_users
-        ADD index_id smallint(6) NOT NULL DEFAULT '0';
-    `)
-  // rename from camel case to snake case (typeorm standard to cakePHP standard)
-  await queryFn(`
-      ALTER TABLE state_users 
-        CHANGE COLUMN groupId group_id int(10) unsigned NOT NULL DEFAULT '0',
-        CHANGE COLUMN pubkey public_key binary(32) NOT NULL,
-        CHANGE COLUMN firstName first_name varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
-        CHANGE COLUMN lastName last_name varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL;
-    `)
-}
diff --git a/database/src/prepare.ts b/database/src/prepare.ts
index 440289aea..fda4b4e13 100644
--- a/database/src/prepare.ts
+++ b/database/src/prepare.ts
@@ -25,6 +25,12 @@ export default async (): Promise<void> => {
       DEFAULT CHARACTER SET utf8mb4
       DEFAULT COLLATE utf8mb4_unicode_ci;`)
 
+  // Create Database `gradido_community_test` for tests
+  await con.query(`
+    CREATE DATABASE IF NOT EXISTS ${CONFIG.DB_DATABASE}_test 
+      DEFAULT CHARACTER SET utf8mb4
+      DEFAULT COLLATE utf8mb4_unicode_ci;`)
+
   // Check if old migration table is present, delete if needed
   const [rows] = await con.query(`SHOW TABLES FROM \`${CONFIG.DB_DATABASE}\` LIKE 'migrations';`)
   if ((<RowDataPacket>rows).length > 0) {
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 851f2a376..5db1c0a82 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -105,7 +105,8 @@
   "language": "Sprache",
   "languages": {
     "de": "Deutsch",
-    "en": "English"
+    "en": "English",
+    "success": "Deine Sprache wurde erfolgreich geändert."
   },
   "login": "Anmeldung",
   "logout": "Abmelden",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 4edf8e72d..9ca544440 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -105,7 +105,8 @@
   "language": "Language",
   "languages": {
     "de": "Deutsch",
-    "en": "English"
+    "en": "English",
+    "success": "Your language has been successfully updated."
   },
   "login": "Login",
   "logout": "Logout",
diff --git a/frontend/src/views/Pages/UserProfile/UserCard_Language.vue b/frontend/src/views/Pages/UserProfile/UserCard_Language.vue
index 7bd02cf4c..d7a059715 100644
--- a/frontend/src/views/Pages/UserProfile/UserCard_Language.vue
+++ b/frontend/src/views/Pages/UserProfile/UserCard_Language.vue
@@ -23,13 +23,13 @@
             <b>{{ $t('language') }}</b>
           </small>
         </b-col>
-        <b-col class="col-12">{{ $store.state.language }}</b-col>
+        <b-col class="col-12">{{ $t(buildTagFromLanguageString()) }}</b-col>
       </b-row>
     </div>
 
     <div v-else>
       <div>
-        <b-form @submit.stop.prevent="handleSubmit(onSubmit)">
+        <b-form @submit.stop.prevent="onSubmit">
           <b-row class="mb-2">
             <b-col class="col-12">
               <small>
@@ -62,6 +62,7 @@
   </b-card>
 </template>
 <script>
+import { localeChanged } from 'vee-validate'
 import LanguageSwitchSelect from '../../../components/LanguageSwitchSelect.vue'
 import { updateUserInfos } from '../../../graphql/queries'
 
@@ -93,16 +94,25 @@ export default {
         .query({
           query: updateUserInfos,
           variables: {
-            language: this.$store.state.language,
+            email: this.$store.state.email,
+            locale: this.language,
           },
         })
         .then(() => {
+          this.$i18n.locale = this.language
+          this.$store.commit('language', this.$i18n.locale)
+          localeChanged(this.$i18n.locale)
           this.cancelEdit()
+          this.$toasted.success(this.$t('languages.success'))
         })
         .catch((error) => {
           this.$toasted.error(error.message)
         })
     },
+
+    buildTagFromLanguageString() {
+      return 'languages.' + this.$store.state.language
+    },
   },
 }
 </script>