diff --git a/src/deskstar-backend/Deskstar/Controllers/UserController.cs b/src/deskstar-backend/Deskstar/Controllers/UserController.cs
index a4f81938..e23e2d5f 100644
--- a/src/deskstar-backend/Deskstar/Controllers/UserController.cs
+++ b/src/deskstar-backend/Deskstar/Controllers/UserController.cs
@@ -1,9 +1,9 @@
-using System.IdentityModel.Tokens.Jwt;
+using Deskstar.Core;
+using Deskstar.Entities;
 using Deskstar.Models;
 using Deskstar.Usecases;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Net.Http.Headers;
 
 namespace Deskstar.Controllers;
 
@@ -24,6 +24,46 @@ public UserController(ILogger<UserController> logger, IUserUsecases userUsecases
         _autoMapperConfiguration = autoMapperConfiguration;
     }
     /// <summary>
+    /// Returns all users for a specific company
+    /// </summary>
+    /// <returns> List of user information in JSON Format </returns>
+    /// <remarks>
+    /// Sample request:
+    ///     Get /users with JWT Token
+    /// </remarks>
+    /// 
+    /// <response code="200">List of user information in JSON Format</response>
+    /// <response code="500">Internal Server Error</response>
+    /// <response code="400">Bad Request</response>
+    [HttpGet]
+    [Authorize(Policy = "Admin")]
+    [ProducesResponseType(typeof(UserProfileDto), StatusCodes.Status200OK)]
+    [ProducesResponseType(StatusCodes.Status400BadRequest)]
+    [ProducesResponseType(StatusCodes.Status500InternalServerError)]
+    [Produces("application/json")]
+    public IActionResult Get()
+    {
+        var userId = RequestInteractions.ExtractIdFromRequest(Request);
+        try
+        {
+            var entities = _userUsecases.ReadAllUsers(userId);
+            var mapper = _autoMapperConfiguration.GetConfiguration().CreateMapper();
+            var users = entities.Select<User, UserProfileDto>(user => mapper.Map<User, UserProfileDto>(user)).ToList();
+
+            return Ok(users);
+        }
+        catch (ArgumentException e)
+        {
+            _logger.LogError(e, e.Message);
+            return Problem(detail: e.Message, statusCode: 400);
+        }
+        catch (Exception e)
+        {
+            _logger.LogError(e, e.Message);
+            return Problem(statusCode: 500);
+        }
+    }
+    /// <summary>
     /// Returns user specific information
     /// </summary>
     /// <returns> User information in JSON Format </returns>
@@ -43,10 +83,7 @@ public UserController(ILogger<UserController> logger, IUserUsecases userUsecases
     [Produces("application/json")]
     public IActionResult GetMe()
     {
-        var accessToken = Request.Headers[HeaderNames.Authorization].ToString().Replace("Bearer ", string.Empty);
-        var handler = new JwtSecurityTokenHandler();
-        var jwtSecurityToken = handler.ReadJwtToken(accessToken);
-        var userId = new Guid(jwtSecurityToken.Claims.First(claim => claim.Type == JwtRegisteredClaimNames.NameId).Value);
+        var userId = RequestInteractions.ExtractIdFromRequest(Request);
 
         try
         {
@@ -67,7 +104,7 @@ public IActionResult GetMe()
         }
     }
 
-     /// <summary>
+    /// <summary>
     /// Lets an admin approve a users registration for their company
     /// </summary>
     /// <returns> empty response </returns>
@@ -86,10 +123,7 @@ public IActionResult GetMe()
     [ProducesResponseType(StatusCodes.Status500InternalServerError)]
     public IActionResult ApproveUser(string userId)
     {
-        var accessToken = Request.Headers[HeaderNames.Authorization].ToString().Replace("Bearer ", string.Empty);
-        var handler = new JwtSecurityTokenHandler();
-        var jwtSecurityToken = handler.ReadJwtToken(accessToken);
-        var adminId = new Guid(jwtSecurityToken.Claims.First(claim => claim.Type == JwtRegisteredClaimNames.NameId).Value);
+        var adminId = RequestInteractions.ExtractIdFromRequest(Request);
 
         try
         {
@@ -127,10 +161,7 @@ public IActionResult ApproveUser(string userId)
     [ProducesResponseType(StatusCodes.Status500InternalServerError)]
     public IActionResult DeclineUser(string userId)
     {
-        var accessToken = Request.Headers[HeaderNames.Authorization].ToString().Replace("Bearer ", string.Empty);
-        var handler = new JwtSecurityTokenHandler();
-        var jwtSecurityToken = handler.ReadJwtToken(accessToken);
-        var adminId = new Guid(jwtSecurityToken.Claims.First(claim => claim.Type == JwtRegisteredClaimNames.NameId).Value);
+        var adminId = RequestInteractions.ExtractIdFromRequest(Request);
 
         try
         {
@@ -148,4 +179,43 @@ public IActionResult DeclineUser(string userId)
             return Problem(statusCode: 500);
         }
     }
+    /// <summary>
+    /// Update user information
+    /// </summary>
+    /// <returns> empty response </returns>
+    /// <remarks>
+    /// Sample request:
+    ///     Post /users/me
+    /// </remarks>
+    ///
+    /// <response code="200">Empty Response</response>
+    /// <response code="500">Internal Server Error</response>
+    /// <response code="400">Bad Request</response>
+    [HttpPost("me")]
+    [Authorize]
+    [ProducesResponseType(typeof(void), StatusCodes.Status200OK)]
+    [ProducesResponseType(StatusCodes.Status400BadRequest)]
+    [ProducesResponseType(StatusCodes.Status500InternalServerError)]
+    public IActionResult UpdateUser(UserProfileDto userDto)
+    {
+        var userId = RequestInteractions.ExtractIdFromRequest(Request);
+
+        try
+        {
+            var mapper = _autoMapperConfiguration.GetConfiguration().CreateMapper();
+            var user = mapper.Map<UserProfileDto, User>(userDto);
+            _userUsecases.UpdateUser(user);
+            return Ok();
+        }
+        catch (ArgumentException e)
+        {
+            _logger.LogError(e, e.Message);
+            return Problem(detail: e.Message, statusCode: 400);
+        }
+        catch (Exception e)
+        {
+            _logger.LogError(e, e.Message);
+            return Problem(statusCode: 500);
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/deskstar-backend/Deskstar/Core/RequestInteractions.cs b/src/deskstar-backend/Deskstar/Core/RequestInteractions.cs
new file mode 100644
index 00000000..ab1e096b
--- /dev/null
+++ b/src/deskstar-backend/Deskstar/Core/RequestInteractions.cs
@@ -0,0 +1,15 @@
+using System.IdentityModel.Tokens.Jwt;
+using Microsoft.Net.Http.Headers;
+
+namespace Deskstar.Core;
+
+public class RequestInteractions
+{
+    public static Guid ExtractIdFromRequest(HttpRequest request)
+    {
+        var accessToken = request.Headers[HeaderNames.Authorization].ToString().Replace("Bearer ", string.Empty);
+        var handler = new JwtSecurityTokenHandler();
+        var jwtSecurityToken = handler.ReadJwtToken(accessToken);
+        return new Guid(jwtSecurityToken.Claims.First(claim => claim.Type == JwtRegisteredClaimNames.NameId).Value);
+    }
+}
\ No newline at end of file
diff --git a/src/deskstar-backend/Deskstar/Models/UserProfileDto.cs b/src/deskstar-backend/Deskstar/Models/UserProfileDto.cs
index ec02ef02..57824fe5 100644
--- a/src/deskstar-backend/Deskstar/Models/UserProfileDto.cs
+++ b/src/deskstar-backend/Deskstar/Models/UserProfileDto.cs
@@ -15,6 +15,8 @@ public static void createMappings(IMapperConfigurationExpression cfg)
         {
             cfg.CreateMap<Entities.User, UserProfileDto>()
                 .ForMember(dest => dest.Company, act => act.MapFrom(src => src.Company));
+            cfg.CreateMap<UserProfileDto, Entities.User>()
+                .ForMember(dest => dest.Company, act => act.MapFrom(src => src.Company));
         }
 
         public Guid UserId { get; set; }
diff --git a/src/deskstar-backend/Deskstar/Usecases/UserUsecases.cs b/src/deskstar-backend/Deskstar/Usecases/UserUsecases.cs
index 9bd6cc94..a6dee0f6 100644
--- a/src/deskstar-backend/Deskstar/Usecases/UserUsecases.cs
+++ b/src/deskstar-backend/Deskstar/Usecases/UserUsecases.cs
@@ -6,6 +6,8 @@ namespace Deskstar.Usecases;
 
 public interface IUserUsecases
 {
+    public List<User> ReadAllUsers(Guid adminId);
+    public Guid UpdateUser(User user);
     public User ReadSpecificUser(Guid userId);
     public Guid ApproveUser(Guid adminId, string userId);
     public Guid DeclineUser(Guid adminId, string userId);
@@ -86,4 +88,32 @@ public Guid DeclineUser(Guid adminId, string userId)
             throw new ArgumentException($"There is no user with id '{userId}'");
         }
     }
+
+    public List<User> ReadAllUsers(Guid adminId)
+    {
+        try
+        {
+            var admin = _context.Users.Single(user => user.UserId == adminId);
+            return _context.Users.Where(user => user.CompanyId == admin.CompanyId).ToList();
+        }
+        catch (InvalidOperationException)
+        {
+            throw new ArgumentException($"There is no admin with id '{adminId}'");
+        }
+    }
+
+    public Guid UpdateUser(User user)
+    {
+        try
+        {
+            _context.Users.Single(u => u.UserId == user.UserId);
+            _context.Users.Update(user);
+            _context.SaveChanges();
+            return user.UserId;
+        }
+        catch (InvalidOperationException)
+        {
+            throw new ArgumentException($"There is no user with id '{user.UserId}'");
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/deskstar-backend/Teststar.Tests/Tests/UserUsecasesTests.cs b/src/deskstar-backend/Teststar.Tests/Tests/UserUsecasesTests.cs
index 90c23e15..5f557c0c 100644
--- a/src/deskstar-backend/Teststar.Tests/Tests/UserUsecasesTests.cs
+++ b/src/deskstar-backend/Teststar.Tests/Tests/UserUsecasesTests.cs
@@ -64,10 +64,10 @@ public void ApproveUser_ShouldApproveUser_WhenValidUserIdIsGiven()
 
         //arrange
         var logger = new Mock<ILogger<UserUsecases>>();
-        var adminUsecases = new UserUsecases(logger.Object, db);
+        var userUsecases = new UserUsecases(logger.Object, db);
 
         //act
-        var result = adminUsecases.ApproveUser(admin.UserId, user.UserId.ToString());
+        var result = userUsecases.ApproveUser(admin.UserId, user.UserId.ToString());
 
         //assert
         Assert.That(result == user.UserId);
@@ -87,10 +87,10 @@ public void ApproveUser_ShouldThrowArgumentException_WhenInvalidUserIdIsGiven()
 
         //arrange
         var logger = new Mock<ILogger<UserUsecases>>();
-        var adminUsecases = new UserUsecases(logger.Object, db);
+        var userUsecases = new UserUsecases(logger.Object, db);
 
         //act + assert
-        Assert.Throws<ArgumentException>(() => adminUsecases.ApproveUser(admin.UserId, "invalidguid"));
+        Assert.Throws<ArgumentException>(() => userUsecases.ApproveUser(admin.UserId, "invalidguid"));
 
         //cleanup
         db.Database.EnsureDeleted();
@@ -106,10 +106,10 @@ public void ApproveUser_ShouldThrowArgumentException_WhenThereIsNoUserWithGivenI
 
         //arrange
         var logger = new Mock<ILogger<UserUsecases>>();
-        var adminUsecases = new UserUsecases(logger.Object, db);
+        var userUsecases = new UserUsecases(logger.Object, db);
 
         //act + assert
-        Assert.Throws<ArgumentException>(() => adminUsecases.ApproveUser(admin.UserId, (new Guid()).ToString()));
+        Assert.Throws<ArgumentException>(() => userUsecases.ApproveUser(admin.UserId, (new Guid()).ToString()));
 
         //cleanup
         db.Database.EnsureDeleted();
@@ -125,10 +125,10 @@ public void ApproveUser_ShouldThrowArgumentException_WhenValidUserIsGivenButAdmi
 
         //arrange
         var logger = new Mock<ILogger<UserUsecases>>();
-        var adminUsecases = new UserUsecases(logger.Object, db);
+        var userUsecases = new UserUsecases(logger.Object, db);
 
         //act + assert
-        Assert.Throws<ArgumentException>(() => adminUsecases.ApproveUser(admin.UserId, user.UserId.ToString()));
+        Assert.Throws<ArgumentException>(() => userUsecases.ApproveUser(admin.UserId, user.UserId.ToString()));
 
         //cleanup
         db.Database.EnsureDeleted();
@@ -144,10 +144,10 @@ public void DeclineUser_ShouldThrowArgumentException_WhenValidUserIsGivenButAdmi
 
         //arrange
         var logger = new Mock<ILogger<UserUsecases>>();
-        var adminUsecases = new UserUsecases(logger.Object, db);
+        var userUsecases = new UserUsecases(logger.Object, db);
 
         //act + assert
-        Assert.Throws<ArgumentException>(() => adminUsecases.DeclineUser(admin.UserId, user.UserId.ToString()));
+        Assert.Throws<ArgumentException>(() => userUsecases.DeclineUser(admin.UserId, user.UserId.ToString()));
 
         //cleanup
         db.Database.EnsureDeleted();
@@ -164,10 +164,10 @@ public void DeclineUser_ShouldThrowArgumentException_WhenUserIsAlreadyApproved()
 
         //arrange
         var logger = new Mock<ILogger<UserUsecases>>();
-        var adminUsecases = new UserUsecases(logger.Object, db);
+        var userUsecases = new UserUsecases(logger.Object, db);
 
         //act + assert
-        Assert.Throws<ArgumentException>(() => adminUsecases.DeclineUser(admin.UserId, user.UserId.ToString()));
+        Assert.Throws<ArgumentException>(() => userUsecases.DeclineUser(admin.UserId, user.UserId.ToString()));
 
         //cleanup
         db.Database.EnsureDeleted();
@@ -183,10 +183,10 @@ public void DeclineUser_ShouldThrowArgumentException_WhenNoUserExistsWithGivenId
 
         //arrange
         var logger = new Mock<ILogger<UserUsecases>>();
-        var adminUsecases = new UserUsecases(logger.Object, db);
+        var userUsecases = new UserUsecases(logger.Object, db);
 
         //act + assert
-        Assert.Throws<ArgumentException>(() => adminUsecases.DeclineUser(admin.UserId, (new Guid()).ToString()));
+        Assert.Throws<ArgumentException>(() => userUsecases.DeclineUser(admin.UserId, (new Guid()).ToString()));
 
         //cleanup
         db.Database.EnsureDeleted();
@@ -204,10 +204,10 @@ public void DeclineUser_ShouldRemoveUser_WhenValidUserIdIsGiven()
 
         //arrange
         var logger = new Mock<ILogger<UserUsecases>>();
-        var adminUsecases = new UserUsecases(logger.Object, db);
+        var userUsecases = new UserUsecases(logger.Object, db);
 
         //act
-        var result = adminUsecases.DeclineUser(admin.UserId, user.UserId.ToString());
+        var result = userUsecases.DeclineUser(admin.UserId, user.UserId.ToString());
 
         //assert
         var userWasRemoved = !db.Users.Contains(user);
@@ -218,6 +218,86 @@ public void DeclineUser_ShouldRemoveUser_WhenValidUserIdIsGiven()
         db.Database.EnsureDeleted();
     }
 
+    [Test]
+    public void UpdateUser_WhenValidUserIsProvided_ShouldUpdateUser()
+    {
+        //setup
+        using var db = new DataContext();
+        User user, admin;
+        bool isUserApproved = true;
+
+        SetupSingleUser(db, isUserApproved, out user, out admin);
+
+        //arrange
+        var logger = new Mock<ILogger<UserUsecases>>();
+        var userUsecases = new UserUsecases(logger.Object, db);
+
+        //act
+        var result = userUsecases.UpdateUser(user);
+
+        //assert
+        Assert.That(result == user.UserId);
+
+    }
+    [Test]
+    public void UpdateUser_WhenInvalidUserIsProvided_ShouldThrowArgumentException()
+    {
+        //setup
+        using var db = new DataContext();
+        User user, admin;
+        bool isUserApproved = true;
+
+        SetupSingleUser(db, isUserApproved, out user, out admin);
+
+        //arrange
+        var logger = new Mock<ILogger<UserUsecases>>();
+        var userUsecases = new UserUsecases(logger.Object, db);
+
+        //act + assert
+        Assert.Throws<ArgumentException>(() => userUsecases.UpdateUser(new User()));
+
+    }
+    [Test]
+    public void ReadAllUsers_WhenValidUserIdIsProvided_ShouldReturnListOfAllUsersInTheSameCompany()
+    {
+        //setup
+        using var db = new DataContext();
+        User user, admin;
+        bool isUserApproved = true;
+
+        SetupSingleUser(db, isUserApproved, out user, out admin);
+
+        //arrange
+        var logger = new Mock<ILogger<UserUsecases>>();
+        var userUsecases = new UserUsecases(logger.Object, db);
+
+        //act 
+        var result = userUsecases.ReadAllUsers(admin.UserId);
+
+        //assert
+        Assert.That(result.Count != 0);
+        Assert.That(result.Contains(user));
+
+    }
+    [Test]
+    public void ReadAllUsers_WhenInvalidUserIdIsProvided_ShouldThrowArgumentException()
+    {
+        //setup
+        using var db = new DataContext();
+        User user, admin;
+        bool isUserApproved = true;
+
+        SetupSingleUser(db, isUserApproved, out user, out admin);
+
+        //arrange
+        var logger = new Mock<ILogger<UserUsecases>>();
+        var userUsecases = new UserUsecases(logger.Object, db);
+
+        //act + assert
+        Assert.Throws<ArgumentException>(() => userUsecases.ReadAllUsers(new Guid()));
+
+    }
+
     private void SetupSingleUser(DataContext db, bool userApproved, out User user, out User admin)
     {
         var hasher = new PasswordHasher<User>();