diff --git a/server/controller/Usuario/get.js b/server/controller/Usuario/usuario.js
similarity index 92%
rename from server/controller/Usuario/get.js
rename to server/controller/Usuario/usuario.js
index 09fdf62..432f648 100644
--- a/server/controller/Usuario/get.js
+++ b/server/controller/Usuario/usuario.js
@@ -14,6 +14,7 @@ const get = async (body) => {
     delete res.dataValues.password;
     delete res.dataValues.idTipoUsuario;
     delete res.dataValues.idCarrera;
+    if (!res.Carrera) delete res.dataValues.Carrera;
     return res;
   });
 };
diff --git a/server/controller/Usuario/usuarios.js b/server/controller/Usuario/usuarios.js
new file mode 100644
index 0000000..0e5f707
--- /dev/null
+++ b/server/controller/Usuario/usuarios.js
@@ -0,0 +1,20 @@
+const validar = require('../../helper/validar');
+const Usuario = require('../../db/tablas/Usuario');
+const Carrera = require('../../db/tablas/Carrera');
+const TipoUsuario = require('../../db/tablas/TipoUsuario');
+
+const get = async (body) => {
+  return Usuario.findAll({
+    include: [{ model: TipoUsuario }, { model: Carrera }],
+  }).then((res) => {
+    for (let i = 0; i < res.length; i++) {
+      delete res[i].dataValues.password;
+      delete res[i].dataValues.idTipoUsuario;
+      delete res[i].dataValues.idCarrera;
+      if (!res[i].Carrera) delete res[i].dataValues.Carrera;
+    }
+    return res;
+  });
+};
+
+module.exports = get;
diff --git a/server/routes/Usuario.js b/server/routes/Usuario.js
index fa6ec29..d8c9c9e 100644
--- a/server/routes/Usuario.js
+++ b/server/routes/Usuario.js
@@ -3,7 +3,8 @@ const app = express();
 const { verificaToken } = require('../middleware/autentificacion');
 const route = '/usuario';
 const login = require('../controller/Usuario/login');
-const get = require('../controller/Usuario/get');
+const usuario = require('../controller/Usuario/usuario');
+const usuarios = require('../controller/Usuario/usuarios');
 
 app.post(`${route}/login`, (req, res) => {
   return login(req.body)
@@ -16,7 +17,17 @@ app.post(`${route}/login`, (req, res) => {
 });
 
 app.get(`${route}`, (req, res) => {
-  return get(req.query)
+  return usuario(req.query)
+    .then((data) => {
+      res.status(200).json(data);
+    })
+    .catch((err) => {
+      res.status(400).json({ message: err.message });
+    });
+});
+
+app.get(`${route}/usuarios`, (req, res) => {
+  return usuarios(req.query)
     .then((data) => {
       res.status(200).json(data);
     })