diff --git a/src/MusicStore/Controllers/StoreManagerController.cs b/src/MusicStore/Controllers/StoreManagerController.cs
index 3858c73e1f..df8d478e70 100644
--- a/src/MusicStore/Controllers/StoreManagerController.cs
+++ b/src/MusicStore/Controllers/StoreManagerController.cs
@@ -68,6 +68,12 @@ namespace MusicStore.Controllers
         {
             if (ModelState.IsValid)
             {
+                // TODO [EF] Swap to store generated identity key when supported
+                var nextId = db.Albums.Any()
+                    ? db.Albums.Max(o => o.AlbumId) + 1
+                    : 1;
+
+                album.AlbumId = nextId;
                 db.Albums.Add(album);
                 db.SaveChanges();
                 return RedirectToAction("Index");
diff --git a/src/MusicStore/k.ini b/src/MusicStore/k.ini
index 368c69b1a8..e6981d787a 100644
--- a/src/MusicStore/k.ini
+++ b/src/MusicStore/k.ini
@@ -1,2 +1,2 @@
-KRE_VERSION=0.1-alpha-build-0400
+KRE_VERSION=0.1-alpha-build-0420
 KRE_FLAVOR=CORECLR
\ No newline at end of file