diff --git a/.gitignore b/.gitignore
index ef1066e2..36dbbb18 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-/config
\ No newline at end of file
+/config
+.idea
diff --git a/src/lib/Server.js b/src/lib/Server.js
index 08262e6e..80e24501 100644
--- a/src/lib/Server.js
+++ b/src/lib/Server.js
@@ -99,8 +99,8 @@ module.exports = class Server {
         res.send(config);
       }))
       .post('/api/wireguard/client', Util.promisify(async req => {
-        const { name } = req.body;
-        return WireGuard.createClient({ name });
+        const { name, number } = req.body;
+        return WireGuard.createClient({ name, number });
       }))
       .delete('/api/wireguard/client/:clientId', Util.promisify(async req => {
         const { clientId } = req.params;
diff --git a/src/lib/WireGuard.js b/src/lib/WireGuard.js
index b6d4f9cf..9e4c4f0c 100644
--- a/src/lib/WireGuard.js
+++ b/src/lib/WireGuard.js
@@ -202,15 +202,17 @@ Endpoint = ${WG_HOST}:${WG_PORT}`;
     const publicKey = await Util.exec(`echo ${privateKey} | wg pubkey`);
     const preSharedKey = await Util.exec('wg genpsk');
 
-    // Calculate next IP
+    // IP address operations
     let address;
+    if (!number) {
+      // Calculate next IP
     for (let i = 2; i < 255; i++) {
       const client = Object.values(config.clients).find(client => {
-        return client.address === WG_DEFAULT_ADDRESS.replace('x', i);
+          return client.address === WG_DEFAULT_ADDRESS.replace('x', i.toString());
       });
 
       if (!client) {
-        address = WG_DEFAULT_ADDRESS.replace('x', i);
+          address = WG_DEFAULT_ADDRESS.replace('x', i.toString());
         break;
       }
     }
@@ -218,6 +220,17 @@ Endpoint = ${WG_HOST}:${WG_PORT}`;
     if (!address) {
       throw new Error('Maximum number of clients reached.');
     }
+    } else {
+      // Search & use selected number for IP
+      const client = Object.values(config.clients).find(client => {
+        return client.address === WG_DEFAULT_ADDRESS.replace('x', number);
+      });
+
+      if (client) {
+        throw new Error('Number in use, please select another or leave empty.');
+      }
+      address = WG_DEFAULT_ADDRESS.replace('x', number);
+    }
 
     // Create Client
     const clientId = uuid.v4();
diff --git a/src/www/index.html b/src/www/index.html
index c75e43de..aefa91d7 100644
--- a/src/www/index.html
+++ b/src/www/index.html
@@ -35,7 +35,7 @@
             <p class="text-2xl font-medium">Clients</p>
           </div>
           <div class="flex-shrink-0">
-            <button @click="clientCreate = true; clientCreateName = '';"
+            <button @click="clientCreate = true; clientCreateName = ''; clientCreateNumber = '';"
               class="hover:bg-red-800 hover:border-red-800 hover:text-white text-gray-700 border-2 border-gray-100 py-2 px-4 rounded inline-flex items-center transition">
               <svg class="w-4 mr-2" inline xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
                 stroke="currentColor">
@@ -143,7 +143,7 @@
           </div>
           <div v-if="clients && clients.length === 0">
             <p class="text-center m-10 text-gray-400 text-sm">There are no clients yet.<br /><br />
-              <button @click="clientCreate = true; clientCreateName = '';"
+              <button @click="clientCreate = true; clientCreateName = ''; clientCreateNumber = '';"
                 class="bg-red-800 text-white hover:bg-red-700 border-2 border-none py-2 px-4 rounded inline-flex items-center transition">
                 <svg class="w-4 mr-2" inline xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
                   stroke="currentColor">
@@ -232,12 +232,20 @@
                         type="text" v-model.trim="clientCreateName" placeholder="Name" />
                     </p>
                   </div>
+                  <div class="mt-2">
+                    <p class="text-sm text-gray-500">
+                      <input class="rounded p-2 border-2 border-gray-100 focus:border-gray-200 outline-none w-full"
+                             type="number" min="2" max="254" step="1" v-model="clientCreateNumber"
+                             placeholder="Last number of client IP (optional)"/>
+                    </p>
+                  </div>
                 </div>
               </div>
             </div>
             <div class="bg-gray-50 px-4 py-3 sm:px-6 sm:flex sm:flex-row-reverse">
-              <button v-if="clientCreateName.length" type="button" @click="createClient(); clientCreate = null"
-                class="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-red-800 text-base font-medium text-white hover:bg-red-700 focus:outline-none sm:ml-3 sm:w-auto sm:text-sm">
+              <button v-if="clientCreateName.length && (!clientCreateNumber || (clientCreateNumber > 1 && clientCreateNumber < 255))"
+                      type="button" @click="createClient(); clientCreate = null"
+                      class="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-red-800 text-base font-medium text-white hover:bg-red-700 focus:outline-none sm:ml-3 sm:w-auto sm:text-sm">
                 Create
               </button>
               <button v-else type="button"
@@ -382,4 +390,4 @@
   <script src="/js/app.js"></script>
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/src/www/js/api.js b/src/www/js/api.js
index c7edae0b..85a614ae 100644
--- a/src/www/js/api.js
+++ b/src/www/js/api.js
@@ -65,11 +65,11 @@ class API {
     })));
   }
 
-  async createClient({ name }) {
+  async createClient({ name, number }) {
     return this.call({
       method: 'post',
       path: '/wireguard/client',
-      body: { name },
+      body: { name, number },
     });
   }
 
diff --git a/src/www/js/app.js b/src/www/js/app.js
index fb2cd715..c257fc1f 100644
--- a/src/www/js/app.js
+++ b/src/www/js/app.js
@@ -17,6 +17,7 @@ new Vue({
     clientDelete: null,
     clientCreate: null,
     clientCreateName: '',
+    clientCreateNumber: '',
     qrcode: null,
   },
   methods: {
@@ -80,9 +81,10 @@ new Vue({
     },
     createClient() {
       const name = this.clientCreateName;
+      const number = this.clientCreateNumber;
       if (!name) return;
 
-      this.api.createClient({ name })
+      this.api.createClient({ name, number })
         .catch(err => alert(err.message || err.toString()))
         .finally(() => this.refresh().catch(console.error));
     },