diff --git a/zero.Core/Api/CountriesApi.cs b/zero.Core/Api/CountriesApi.cs
index bbc511e7..562ca600 100644
--- a/zero.Core/Api/CountriesApi.cs
+++ b/zero.Core/Api/CountriesApi.cs
@@ -1,10 +1,13 @@
-using Raven.Client.Documents;
+using FluentValidation.Results;
+using Raven.Client.Documents;
 using Raven.Client.Documents.Linq;
 using Raven.Client.Documents.Session;
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using zero.Core.Entities;
 using zero.Core.Extensions;
+using zero.Core.Validation;
 
 namespace zero.Core.Api
 {
@@ -57,6 +60,42 @@ namespace zero.Core.Api
           .ToQueriedListAsync(query);
       }
     }
+
+
+    /// <inheritdoc />
+    public async Task<EntityResult<Country>> Save(Country model)
+    {
+      ValidationResult validation = await new CountryValidator().ValidateAsync(model);
+
+      if (!validation.IsValid)
+      {
+        return EntityResult<Country>.Fail(validation);
+      }
+
+      if (model.Id.IsNullOrEmpty())
+      {
+        model.AppId = "zero.applications.1-A"; // TODO real app id
+        model.CreatedDate = DateTimeOffset.Now;
+      }
+
+      model.Alias = Alias.Generate(model.Name);
+
+      using (IAsyncDocumentSession session = Raven.OpenAsyncSession())
+      {
+        await session.StoreAsync(model);
+
+        string id = session.Advanced.GetDocumentId(model);
+
+        await session.SaveChangesAsync();
+
+        if (model.Id.IsNullOrEmpty())
+        {
+          model.Id = id;
+        }
+      }
+
+      return EntityResult<Country>.Success(model);
+    }
   }
 
 
@@ -76,5 +115,10 @@ namespace zero.Core.Api
     /// Get all available countries (with query)
     /// </summary>
     Task<ListResult<Country>> GetByQuery(string languageId, ListQuery<Country> query);
+
+    /// <summary>
+    /// Creates or updates a country
+    /// </summary>
+    Task<EntityResult<Country>> Save(Country model);
   }
 }
diff --git a/zero.Core/Api/Token.cs b/zero.Core/Api/Token.cs
new file mode 100644
index 00000000..b73b482d
--- /dev/null
+++ b/zero.Core/Api/Token.cs
@@ -0,0 +1,103 @@
+using Raven.Client.Documents;
+using Raven.Client.Documents.Session;
+using System;
+using System.Threading.Tasks;
+using zero.Core.Entities;
+using zero.Core.Extensions;
+
+namespace zero.Core.Api
+{
+  public class Token : IToken
+  {
+    protected IDocumentStore Raven { get; private set; }
+
+    protected IZeroConfiguration Config { get; private set; }
+
+    private const string PREFIX = "ChangeTokens.";
+
+
+    public Token(IDocumentStore raven, IZeroConfiguration config)
+    {
+      Raven = raven;
+      Config = config;
+    }
+
+
+    /// <inheritdoc />
+    public async Task<bool> Verify(IZeroEntity entity, string token)
+    {
+      return await Verify(entity?.Id, token);
+    }
+
+
+    /// <inheritdoc />
+    public async Task<bool> Verify(string entityId, string token)
+    {
+      if (token.IsNullOrWhiteSpace() || entityId.IsNullOrEmpty())
+      {
+        return false;
+      }
+
+      using (IAsyncDocumentSession session = Raven.OpenAsyncSession())
+      {
+        return await session.Query<ChangeToken>().AnyAsync(x => x.Id == token && x.ReferenceId == entityId);
+      }
+    }
+
+
+    /// <inheritdoc />
+    public async Task<string> Get(IZeroEntity entity)
+    {
+      return await Get(entity?.Id);
+    }
+
+
+    /// <inheritdoc />
+    public async Task<string> Get(string entityId)
+    {
+      if (entityId.IsNullOrEmpty())
+      {
+        return null;
+      }
+
+      ChangeToken token = new ChangeToken()
+      {
+        Id = Constants.Database.CollectionPrefix + PREFIX + Guid.NewGuid(),
+        ReferenceId = entityId
+      };
+
+      using (IAsyncDocumentSession session = Raven.OpenAsyncSession())
+      {
+        await session.StoreAsync(token);
+        session.Advanced.GetMetadataFor(token)[Constants.Database.Expires] = DateTime.UtcNow.AddMinutes(Config.TokenExpiration);
+        await session.SaveChangesAsync();
+      }
+
+      return token.Id;
+    }
+  }
+
+
+  public interface IToken
+  {
+    /// <summary>
+    /// Verifies if the change token is valid for the entity
+    /// </summary>
+    Task<bool> Verify(IZeroEntity entity, string token);
+
+    /// <summary>
+    /// Verifies if the change token is valid for the entity
+    /// </summary>
+    Task<bool> Verify(string entityId, string token);
+
+    /// <summary>
+    /// Get a new change token for the entity
+    /// </summary>
+    Task<string> Get(IZeroEntity entity);
+
+    /// <summary>
+    /// Get a new change token for the entity
+    /// </summary>
+    Task<string> Get(string entityId);
+  }
+}
diff --git a/zero.Core/Configuration.cs b/zero.Core/Configuration.cs
index ea3a6ce6..def426dc 100644
--- a/zero.Core/Configuration.cs
+++ b/zero.Core/Configuration.cs
@@ -11,6 +11,9 @@
     /// <inheritdoc />
     public string[] SupportedLanguages { get; private set; } = new string[] { "en-US", "de-DE" };
 
+    /// <inheritdoc />
+    public int TokenExpiration { get; set; }
+
     /// <inheritdoc />
     public RavenConfig Raven { get; set; }
 
@@ -36,6 +39,11 @@
     /// </summary>
     string[] SupportedLanguages { get; }
 
+    /// <summary>
+    /// Expiration in minutes of a generated change token for an entity
+    /// </summary>
+    int TokenExpiration { get; set; }
+
     /// <summary>
     /// RavenDB configuration data
     /// </summary>
diff --git a/zero.Core/Constants.cs b/zero.Core/Constants.cs
index 870c7db8..4f915dce 100644
--- a/zero.Core/Constants.cs
+++ b/zero.Core/Constants.cs
@@ -26,6 +26,7 @@
       public const string SharedAppId = "shared";
       public const string CollectionPrefix = "zero.";
       public const string ReservationPrefix = "zero.";
+      public const string Expires = Raven.Client.Constants.Documents.Metadata.Expires;
     }
 
     public static class Sections
diff --git a/zero.Core/Entities/ChangeToken.cs b/zero.Core/Entities/ChangeToken.cs
new file mode 100644
index 00000000..07596304
--- /dev/null
+++ b/zero.Core/Entities/ChangeToken.cs
@@ -0,0 +1,13 @@
+namespace zero.Core.Entities
+{
+  /// <summary>
+  /// A change token holds a reference to a database entity
+  /// This is used to verify change requests for entities in the zero backoffice
+  /// </summary>
+  public class ChangeToken
+  {
+    public string Id { get; set; }
+
+    public string ReferenceId { get; set; }
+  }
+}
diff --git a/zero.Core/Entities/DatabaseEntity.cs b/zero.Core/Entities/DatabaseEntity.cs
index 05cc876e..3264847b 100644
--- a/zero.Core/Entities/DatabaseEntity.cs
+++ b/zero.Core/Entities/DatabaseEntity.cs
@@ -10,7 +10,7 @@ namespace zero.Core.Entities
   }
 
   [DebuggerDisplay("Id = {Id,nq}, Name = {Name}, Alias = {Alias}")]
-  public abstract class DatabaseEntity : IDatabaseEntity
+  public abstract class DatabaseEntity : IDatabaseEntity, IZeroEntity
   {
     /// <inheritdoc/>
     [GenerateId]
diff --git a/zero.Core/Validation/CountryValidator.cs b/zero.Core/Validation/CountryValidator.cs
new file mode 100644
index 00000000..3e621b26
--- /dev/null
+++ b/zero.Core/Validation/CountryValidator.cs
@@ -0,0 +1,16 @@
+using FluentValidation;
+using zero.Core.Entities;
+using zero.Core.Entities.Setup;
+using zero.Core.Extensions;
+
+namespace zero.Core.Validation
+{
+  public class CountryValidator : AbstractValidator<Country>
+  {
+    public CountryValidator()
+    {
+      RuleFor(x => x.Code).Length(2);
+      RuleFor(x => x.Name).Length(2, 120);
+    }
+  }
+}
diff --git a/zero.Web/App/Pages/settings/country.vue b/zero.Web/App/Pages/settings/country.vue
index be51a263..239e93b0 100644
--- a/zero.Web/App/Pages/settings/country.vue
+++ b/zero.Web/App/Pages/settings/country.vue
@@ -11,10 +11,10 @@
       <ui-button :submit="true" label="Save" :state="form.state" />
     </ui-header-bar>
 
-    <div class="ui-form-box has-sidebar" label="General">
+    <div class="ui-view-box has-sidebar" label="General">
       <div class="ui-box">
         <ui-property label="@ui.name" :required="true">
-          <input v-model="model.name" type="text" class="ui-input" />
+          <input v-model="model.name" type="text" class="ui-input" maxlength="120" />
         </ui-property>
         <ui-property label="@country.fields.code" description="@country.fields.code_text" :required="true">
           <input v-model="model.code" type="text" class="ui-input country-flag-input" maxlength="2" />
@@ -23,7 +23,7 @@
           <ui-toggle v-model="model.isPreferred" />
         </ui-property>
       </div>
-      <aside class="ui-form-box-aside">
+      <aside class="ui-view-box-aside">
         <ui-property label="@ui.active" :vertical="true" :is-text="true">
           <ui-toggle v-model="model.isActive" />
         </ui-property>
@@ -90,22 +90,15 @@
       {
         form.load(CountriesApi.getById(this.id)).then(response =>
         {
-          console.info(response);
           this.model = response;
         });
       },
 
       onSubmit(form)
       {
-        form.handle(new Promise(resolve =>
+        form.handle(CountriesApi.save(this.model)).then(response =>
         {
-          setTimeout(() =>
-          {
-            resolve(true);
-          }, 1000);
-        })).then(() =>
-        {
-          form.setDirty(false);
+          console.info(response);
         });
       },
 
diff --git a/zero.Web/App/components/forms/error-view.vue b/zero.Web/App/components/forms/error-view.vue
index 17613250..18ed5f56 100644
--- a/zero.Web/App/components/forms/error-view.vue
+++ b/zero.Web/App/components/forms/error-view.vue
@@ -26,7 +26,7 @@
 
 
 <script>
-  const KNOWN_ERRORS = [403, 404, 504];
+  const KNOWN_ERRORS = [403, 404, 409, 504];
 
   export default {
 
diff --git a/zero.Web/App/resources/countries.js b/zero.Web/App/resources/countries.js
index b49fa61c..504c4845 100644
--- a/zero.Web/App/resources/countries.js
+++ b/zero.Web/App/resources/countries.js
@@ -12,5 +12,11 @@ export default {
   getAll(query)
   {
     return Axios.get('countries/getAll', { params: query }).then(res => Promise.resolve(res.data));
+  },
+
+  // save a country
+  save(model)
+  {
+    return Axios.post('countries/save', model).then(res => Promise.resolve(res.data));
   }
 };
\ No newline at end of file
diff --git a/zero.Web/Controllers/BackofficeController.cs b/zero.Web/Controllers/BackofficeController.cs
index 1ed31543..ae5a7ecf 100644
--- a/zero.Web/Controllers/BackofficeController.cs
+++ b/zero.Web/Controllers/BackofficeController.cs
@@ -1,8 +1,11 @@
 using Microsoft.AspNetCore.Mvc;
 using System.Threading.Tasks;
 using zero.Core;
+using zero.Core.Api;
+using zero.Core.Entities;
 using zero.Core.Identity;
 using zero.Web.Mapper;
+using zero.Web.Models;
 
 namespace zero.Web.Controllers
 {
@@ -13,11 +16,14 @@ namespace zero.Web.Controllers
 
     protected IMapper Mapper { get; set; }
 
+    protected IToken Token { get; set; }
 
-    public BackofficeController(IZeroConfiguration config, IMapper mapper)
+
+    public BackofficeController(IZeroConfiguration config, IMapper mapper, IToken token)
     {
       Configuration = config;
       Mapper = mapper;
+      Token = token;
     }
 
 
@@ -27,7 +33,7 @@ namespace zero.Web.Controllers
     }
 
 
-    protected IActionResult Json<T, TTarget>(T model) where TTarget : class, new()
+    protected async Task<IActionResult> As<T, TTarget>(T model) where TTarget : class, new() where T : IZeroEntity
     {
       if (model == null)
       {
@@ -39,7 +45,23 @@ namespace zero.Web.Controllers
         // TODO show error with help on how to inject mapper in constructor + base constructor
       }
 
-      return Json(Mapper.Map<T, TTarget>(model));
+      TTarget result = Mapper.Map<T, TTarget>(model);
+
+      //if (result is EditModel)
+      //{
+      //  (result as EditModel).Meta = new EditModelMeta()
+      //  {
+      //    Token = await Token.Get(model)
+      //  };
+      //}
+
+      return Json(result);
+    }
+
+
+    protected TTarget Map<T, TTarget>(T model) where TTarget : class, new()
+    {
+      return Mapper.Map<T, TTarget>(model);
     }
   }
 }
diff --git a/zero.Web/Controllers/CountriesController.cs b/zero.Web/Controllers/CountriesController.cs
index d356d13a..9b628916 100644
--- a/zero.Web/Controllers/CountriesController.cs
+++ b/zero.Web/Controllers/CountriesController.cs
@@ -5,6 +5,7 @@ using zero.Core;
 using zero.Core.Api;
 using zero.Core.Entities;
 using zero.Core.Identity;
+using zero.Web.Filters;
 using zero.Web.Mapper;
 using zero.Web.Models;
 
@@ -15,7 +16,7 @@ namespace zero.Web.Controllers
   {
     private ICountriesApi Api { get; set; }
 
-    public CountriesController(IZeroConfiguration config, ICountriesApi api, IMapper mapper) : base(config, mapper)
+    public CountriesController(IZeroConfiguration config, ICountriesApi api, IMapper mapper, IToken token) : base(config, mapper, token)
     {
       Api = api;
     }
@@ -23,10 +24,11 @@ namespace zero.Web.Controllers
 
     /// <summary>
     /// Get country by id
-    /// </summary>    
+    /// </summary>
+    [AddToken]
     public async Task<IActionResult> GetById([FromQuery] string id)
     {
-      return Json<Country, CountryEditModel>(await Api.GetById(id));
+      return await As<Country, CountryEditModel>(await Api.GetById(id));
     }
 
 
@@ -37,5 +39,15 @@ namespace zero.Web.Controllers
     {
       return Json(await Api.GetByQuery("en-US", query));
     }
+
+
+    /// <summary>
+    /// Save country
+    /// </summary>
+    [VerifyToken]
+    public async Task<IActionResult> Save([FromBody] CountryEditModel model)
+    {
+      return Json(await Api.Save(Mapper.Map<CountryEditModel, Country>(model)));
+    }
   }
 }
diff --git a/zero.Web/Controllers/UsersController.cs b/zero.Web/Controllers/UsersController.cs
index 7d9968b7..1a15365c 100644
--- a/zero.Web/Controllers/UsersController.cs
+++ b/zero.Web/Controllers/UsersController.cs
@@ -14,7 +14,7 @@ namespace zero.Web.Controllers
   {
     private IUserApi Api { get; set; }
 
-    public UsersController(IZeroConfiguration config, IUserApi api, IMapper mapper) : base(config, mapper)
+    public UsersController(IZeroConfiguration config, IUserApi api, IMapper mapper, IToken token) : base(config, mapper, token)
     {
       Api = api;
     }
@@ -25,7 +25,7 @@ namespace zero.Web.Controllers
     /// </summary>    
     public async Task<IActionResult> GetById([FromQuery] string id)
     {
-      return Json<User, UserEditModel>(await Api.GetUserById(id));
+      return await As<User, UserEditModel>(await Api.GetUserById(id));
     }
 
 
diff --git a/zero.Web/Filters/AddTokenAttribute.cs b/zero.Web/Filters/AddTokenAttribute.cs
new file mode 100644
index 00000000..b1d10977
--- /dev/null
+++ b/zero.Web/Filters/AddTokenAttribute.cs
@@ -0,0 +1,45 @@
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
+using System.Threading.Tasks;
+using zero.Core.Api;
+using zero.Web.Models;
+
+namespace zero.Web.Filters
+{
+  public class AddTokenAttribute : TypeFilterAttribute
+  {
+    public AddTokenAttribute() : base(typeof(AddTokenAttributeImpl)) { }
+
+
+    private class AddTokenAttributeImpl : IAsyncResultFilter
+    {
+      IToken token;
+
+
+      public AddTokenAttributeImpl(IToken token)
+      {
+        this.token = token;
+      }
+
+      public async Task OnResultExecutionAsync(ResultExecutingContext context, ResultExecutionDelegate next)
+      {
+        if (context.Result is JsonResult)
+        {
+          JsonResult result = context.Result as JsonResult;
+
+          if (result.Value is EditModel)
+          {
+            EditModel model = result.Value as EditModel;
+
+            model.Meta = new EditModelMeta()
+            {
+              Token = await token.Get(model.Id)
+            };
+          }
+        }
+
+        await next();
+      }
+    }
+  }
+}
diff --git a/zero.Web/Filters/VerifyTokenAttribute.cs b/zero.Web/Filters/VerifyTokenAttribute.cs
new file mode 100644
index 00000000..adfa720c
--- /dev/null
+++ b/zero.Web/Filters/VerifyTokenAttribute.cs
@@ -0,0 +1,56 @@
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
+using System;
+using System.Threading.Tasks;
+using zero.Core.Api;
+using zero.Web.Models;
+
+namespace zero.Web.Filters
+{
+  public class VerifyTokenAttribute : TypeFilterAttribute
+  {
+    public VerifyTokenAttribute(string key = "model") : base(typeof(VerifyTokenAttributeImpl))
+    {
+      Arguments = new object[] { key };
+    }
+
+
+    private class VerifyTokenAttributeImpl : IAsyncActionFilter
+    {
+      IToken token;
+      string key;
+
+
+      public VerifyTokenAttributeImpl(IToken token, string key)
+      {
+        this.token = token;
+        this.key = key;
+      }
+
+
+      public async Task OnActionExecutionAsync(ActionExecutingContext context, ActionExecutionDelegate next)
+      {
+        if (context.ActionArguments.ContainsKey(key))
+        {
+          object argument = context.ActionArguments[key];
+
+          if (argument is EditModel)
+          {
+            EditModel model = (argument as EditModel);
+            string tokenId = model.Meta?.Token;
+
+            bool isVerified = await token.Verify(model.Id, tokenId);
+
+            if (!isVerified)
+            {
+              context.Result = new StatusCodeResult(409);
+              return;
+            }
+          }
+        }
+
+        await next();
+      }
+    }
+  }
+}
diff --git a/zero.Web/Models/CountryEditModel.cs b/zero.Web/Models/CountryEditModel.cs
index 5379fb4a..56c371f4 100644
--- a/zero.Web/Models/CountryEditModel.cs
+++ b/zero.Web/Models/CountryEditModel.cs
@@ -4,8 +4,6 @@ namespace zero.Web.Models
 {
   public class CountryEditModel : EditModel
   {
-    public string Id { get; set; }
-
     public string Name { get; set; }
 
     public bool IsActive { get; set; }
diff --git a/zero.Web/Models/EditModel.cs b/zero.Web/Models/EditModel.cs
index db292c8c..ffff78c1 100644
--- a/zero.Web/Models/EditModel.cs
+++ b/zero.Web/Models/EditModel.cs
@@ -2,6 +2,11 @@
 {
   public abstract class EditModel
   {
+    /// <summary>
+    /// Id of the entity
+    /// </summary>
+    public string Id { get; set; }
+
     /// <summary>
     /// Meta data for the entity
     /// </summary>
diff --git a/zero.Web/Models/UserEditModel.cs b/zero.Web/Models/UserEditModel.cs
index 05db5976..169801fb 100644
--- a/zero.Web/Models/UserEditModel.cs
+++ b/zero.Web/Models/UserEditModel.cs
@@ -6,8 +6,6 @@ namespace zero.Web.Models
 {
   public class UserEditModel : EditModel
   {
-    public string Id { get; set; }
-
     public string Name { get; set; }
 
     public bool IsActive { get; set; }
diff --git a/zero.Web/Resources/Localization/zero.en-us.json b/zero.Web/Resources/Localization/zero.en-us.json
index 6ec55628..c4db0ac2 100644
--- a/zero.Web/Resources/Localization/zero.en-us.json
+++ b/zero.Web/Resources/Localization/zero.en-us.json
@@ -30,6 +30,8 @@
       "403_text": "You are not allowed to view this resource",
       "404": "Not found",
       "404_text": "The requested resource could not be found<br>({path})",
+      "409": "Conflict",
+      "409_text": "The operation could not be completed as it is not valid anymore. Please reload the page",
       "4xx": "Client error",
       "4xx_text": "There was an internal client error (code: {code})",
       "504": "Timed out",
diff --git a/zero.Web/Sass/Modules/_box.scss b/zero.Web/Sass/Modules/_box.scss
index 5fc5564b..0b8241e1 100644
--- a/zero.Web/Sass/Modules/_box.scss
+++ b/zero.Web/Sass/Modules/_box.scss
@@ -16,7 +16,7 @@
 }
 
 
-.ui-form-box
+.ui-view-box
 {
   padding: var(--padding);
 
@@ -33,7 +33,7 @@
   }
 }
 
-.ui-form-box-aside
+.ui-view-box-aside
 {
   width: 320px;
   max-width: 100%;
diff --git a/zero.Web/Startup.cs b/zero.Web/Startup.cs
index e5cf4b93..2eb6bb3a 100644
--- a/zero.Web/Startup.cs
+++ b/zero.Web/Startup.cs
@@ -122,6 +122,7 @@ namespace zero.Web
       services.AddTransient<ICountriesApi, CountriesApi>();
       services.AddTransient<IUserApi, UserApi>();
       services.AddTransient<IUserRolesApi, UserRolesApi>();
+      services.AddTransient<IToken, Token>();
     }
 
     /// <summary>
diff --git a/zero.Web/zeroSettings.json b/zero.Web/zeroSettings.json
index 9e0800a1..ad6bb22b 100644
--- a/zero.Web/zeroSettings.json
+++ b/zero.Web/zeroSettings.json
@@ -5,6 +5,7 @@
     "en-US",
     "de-DE"
   ],
+  "TokenExpiration": 60,
   "Raven": {
     "Url": "http://localhost:9800",
     "Database": "zero"