diff --git a/module/install/js/app.js b/module/install/js/app.js
index b26f858b16..dc4bad23eb 100644
--- a/module/install/js/app.js
+++ b/module/install/js/app.js
@@ -46,6 +46,7 @@ $(function()
*/
function checkMemory()
{
+ $('#submitBtn').attr('disabled', true);
var apps = [];
$.each(category, (index, cate) =>
{
diff --git a/module/install/view/app.html.php b/module/install/view/app.html.php
index 72f1699c8d..c29c2139c4 100644
--- a/module/install/view/app.html.php
+++ b/module/install/view/app.html.php
@@ -48,7 +48,7 @@
install->solution->skip, '', "id='skipBtn' class='btn btn-install btn-wide' style='display:none;'");?>
- solution->install, "id='submitBtn'", 'btn btn-primary btn-wide')?>
+ solution->install, "id='submitBtn' disabled=disabled", 'btn btn-primary btn-wide')?>
diff --git a/module/instance/model.php b/module/instance/model.php
index f60221069d..777f2caae1 100644
--- a/module/instance/model.php
+++ b/module/instance/model.php
@@ -928,7 +928,9 @@ class InstanceModel extends model
*/
public function createInstance($app, $space, $thirdDomain, $name = '', $k8name = '', $channel = 'stable', $snippets = array())
{
+ $createdBy = $this->app->user->account;
if(empty($k8name)) $k8name = "{$app->chart}-" . date('YmdHis'); //name rule: chartName-userAccount-YmdHis;
+ if(IN_INSTALL && empty($this->app->user->account)) $createdBy = trim($this->app->company->admins, ','); //Set createdBy if in login progress;
$instanceData = new stdclass;
$instanceData->appId = $app->id;