diff --git a/obp-api/src/main/scala/code/views/system/ViewDefinition.scala b/obp-api/src/main/scala/code/views/system/ViewDefinition.scala
index 87ce9351d..ff3a035b1 100644
--- a/obp-api/src/main/scala/code/views/system/ViewDefinition.scala
+++ b/obp-api/src/main/scala/code/views/system/ViewDefinition.scala
@@ -533,8 +533,8 @@ object ViewDefinition extends ViewDefinition with LongKeyedMetaMapper[ViewDefini
   override def beforeSave = List(
     t =>{
       tryo {
-        val viewId = getUniqueKey(t.bank_id.get, t.account_id.get, t.view_id.get)
-        t.composite_unique_key(viewId)
+        val compositeUniqueKey = getUniqueKey(t.bank_id.get, t.account_id.get, t.view_id.get)
+        t.composite_unique_key(compositeUniqueKey)
       }
 
       if (t.isSystem && !checkSystemViewIdOrName(t.view_id.get)) {
diff --git a/obp-api/src/test/scala/code/api/v3_1_0/SystemViewsTests.scala b/obp-api/src/test/scala/code/api/v3_1_0/SystemViewsTests.scala
index c91372e26..8317587e8 100644
--- a/obp-api/src/test/scala/code/api/v3_1_0/SystemViewsTests.scala
+++ b/obp-api/src/test/scala/code/api/v3_1_0/SystemViewsTests.scala
@@ -73,7 +73,6 @@ class SystemViewsTests extends V310ServerSetup {
   // System view, owner
   val randomSystemViewId = APIUtil.generateUUID()
   val postBodySystemViewJson = createSystemViewJsonV300.copy(name=randomSystemViewId).copy(metadata_view = randomSystemViewId).toCreateViewJson
-  val systemViewId = MapperViews.createViewIdByName(postBodySystemViewJson.name)
   
   def getSystemView(viewId : String, consumerAndToken: Option[(Consumer, Token)]): APIResponse = {
     val request = v3_1_0_Request / "system-views" / viewId <@(consumerAndToken)