diff --git a/backend/src/models/entities/image.entity.ts b/backend/src/models/entities/image.entity.ts
index 053be3e..a863952 100644
--- a/backend/src/models/entities/image.entity.ts
+++ b/backend/src/models/entities/image.entity.ts
@@ -3,8 +3,8 @@ import { Column, Entity, Index, PrimaryGeneratedColumn } from 'typeorm';
 
 @Entity()
 export class EImageBackend extends EImage {
-  @PrimaryGeneratedColumn()
-  override id?: number;
+  @PrimaryGeneratedColumn("uuid")
+  override id?: string;
 
   @Index()
   @Column({ unique: true, nullable: false })
diff --git a/backend/src/models/entities/role.entity.ts b/backend/src/models/entities/role.entity.ts
index 015f56e..0632857 100644
--- a/backend/src/models/entities/role.entity.ts
+++ b/backend/src/models/entities/role.entity.ts
@@ -4,8 +4,8 @@ import { Permissions } from '../dto/permissions.dto';
 
 @Entity()
 export class ERoleBackend extends ERole {
-  @PrimaryGeneratedColumn()
-  override id?: number;
+  @PrimaryGeneratedColumn("uuid")
+  override id?: string;
 
   @Index()
   @Column({ nullable: false, unique: true })
diff --git a/backend/src/models/entities/syspreference.entity.ts b/backend/src/models/entities/syspreference.entity.ts
index a1ca470..cf8c12f 100644
--- a/backend/src/models/entities/syspreference.entity.ts
+++ b/backend/src/models/entities/syspreference.entity.ts
@@ -3,8 +3,8 @@ import { Column, Entity, Index, PrimaryGeneratedColumn } from 'typeorm';
 
 @Entity()
 export class ESysPreferenceBackend extends ESysPreference {
-  @PrimaryGeneratedColumn()
-  override id?: number;
+  @PrimaryGeneratedColumn("uuid")
+  override id?: string;
 
   @Index()
   @Column({ nullable: false, unique: true })
diff --git a/backend/src/models/entities/user.entity.ts b/backend/src/models/entities/user.entity.ts
index 6a030ea..4dfd137 100644
--- a/backend/src/models/entities/user.entity.ts
+++ b/backend/src/models/entities/user.entity.ts
@@ -5,8 +5,8 @@ import { Column, Entity, Index, PrimaryGeneratedColumn } from 'typeorm';
 
 @Entity()
 export class EUserBackend extends EUser {
-  @PrimaryGeneratedColumn()
-  override id?: number;
+  @PrimaryGeneratedColumn("uuid")
+  override id?: string;
 
   @Index()
   @Column({ nullable: false, unique: true })
diff --git a/backend/src/models/entities/preference.entity.ts b/backend/src/models/entities/usrpreference.entity.ts
similarity index 87%
rename from backend/src/models/entities/preference.entity.ts
rename to backend/src/models/entities/usrpreference.entity.ts
index 32e1476..1cd6419 100644
--- a/backend/src/models/entities/preference.entity.ts
+++ b/backend/src/models/entities/usrpreference.entity.ts
@@ -2,8 +2,8 @@ import { EUsrPreference } from 'picsur-shared/dist/entities/usrpreference';
 import { Column, Index, PrimaryGeneratedColumn } from 'typeorm';
 
 export class EUsrPreferenceBackend extends EUsrPreference {
-  @PrimaryGeneratedColumn()
-  override id?: number;
+  @PrimaryGeneratedColumn("uuid")
+  override id?: string;
 
   @Index()
   @Column({ nullable: false, unique: true })
diff --git a/frontend/src/app/components/values-picker/values-picker.component.ts b/frontend/src/app/components/values-picker/values-picker.component.ts
index 8d6d883..edbcf24 100644
--- a/frontend/src/app/components/values-picker/values-picker.component.ts
+++ b/frontend/src/app/components/values-picker/values-picker.component.ts
@@ -33,7 +33,7 @@ export class ValuesPickerComponent implements OnInit, OnChanges {
   @Input('disabled-list') disabledSelection: string[] = [];
 
   @Input('value-mapper')
-  valueMapper: (value: string) => string = (value) => 'poopoo';
+  valueMapper: (value: string) => string = (value) => value;
 
   // Selection
   private selectableSubject = new BehaviorSubject<string[]>([]);
diff --git a/shared/src/entities/image.entity.ts b/shared/src/entities/image.entity.ts
index e53cc22..403f0e1 100644
--- a/shared/src/entities/image.entity.ts
+++ b/shared/src/entities/image.entity.ts
@@ -4,7 +4,7 @@ import { EntityID } from '../validators/entity-id.validator';
 
 export class EImage {
   @EntityID()
-  id?: number;
+  id?: string;
 
   @IsHash('sha256')
   hash: string;
diff --git a/shared/src/entities/role.entity.ts b/shared/src/entities/role.entity.ts
index 88d9ba9..0eaa3da 100644
--- a/shared/src/entities/role.entity.ts
+++ b/shared/src/entities/role.entity.ts
@@ -19,5 +19,5 @@ export class RoleNamePermsObject extends RoleNameObject {
 
 export class ERole extends RoleNamePermsObject {
   @EntityID()
-  id?: number;
+  id?: string;
 }
diff --git a/shared/src/entities/syspreference.entity.ts b/shared/src/entities/syspreference.entity.ts
index 62c75fe..1d7b797 100644
--- a/shared/src/entities/syspreference.entity.ts
+++ b/shared/src/entities/syspreference.entity.ts
@@ -3,7 +3,7 @@ import { EntityID } from '../validators/entity-id.validator';
 
 export class ESysPreference {
   @EntityID()
-  id?: number;
+  id?: string;
 
   @IsNotEmpty()
   @IsString()
diff --git a/shared/src/entities/user.entity.ts b/shared/src/entities/user.entity.ts
index 33b9a48..0c7a4d0 100644
--- a/shared/src/entities/user.entity.ts
+++ b/shared/src/entities/user.entity.ts
@@ -28,7 +28,7 @@ export class NameRolesUser extends UsernameUser {
 // Actual entity that goes in the db
 export class EUser extends NameRolesUser {
   @EntityID()
-  id?: number;
+  id?: string;
 
   @IsOptional()
   @Exclude()
diff --git a/shared/src/entities/usrpreference.ts b/shared/src/entities/usrpreference.ts
index 63e30f3..2377cde 100644
--- a/shared/src/entities/usrpreference.ts
+++ b/shared/src/entities/usrpreference.ts
@@ -4,7 +4,7 @@ import { IsPosInt } from '../validators/positive-int.validator';
 
 export class EUsrPreference {
   @EntityID()
-  id?: number;
+  id?: string;
 
   @IsNotEmpty()
   @IsString()
diff --git a/shared/src/validators/entity-id.validator.ts b/shared/src/validators/entity-id.validator.ts
index eed04ae..ff2e0f5 100644
--- a/shared/src/validators/entity-id.validator.ts
+++ b/shared/src/validators/entity-id.validator.ts
@@ -1,5 +1,5 @@
-import { IsInt, IsNotEmpty, IsOptional, Min } from 'class-validator';
+import { IsNotEmpty, IsOptional, IsUUID } from 'class-validator';
 import { CombinePDecorators } from '../util/decorator';
 
-export const EntityID = CombinePDecorators(IsOptional(), IsInt(), Min(0));
-export const EntityIDRequired = CombinePDecorators(IsNotEmpty(), IsInt(), Min(0));
+export const EntityID = CombinePDecorators(IsOptional(), IsUUID('4'));
+export const EntityIDRequired = CombinePDecorators(IsNotEmpty(), IsUUID('4'));