diff --git a/obp-api/src/main/scala/code/api/util/APIUtil.scala b/obp-api/src/main/scala/code/api/util/APIUtil.scala
index 7b2c484aa..815060ca5 100644
--- a/obp-api/src/main/scala/code/api/util/APIUtil.scala
+++ b/obp-api/src/main/scala/code/api/util/APIUtil.scala
@@ -58,6 +58,7 @@ import code.api.dynamic.entity.OBPAPIDynamicEntity
 import code.api._
 import code.api.dynamic.entity.helper.DynamicEntityHelper
 import code.api.v5_0_0.OBPAPI5_0_0
+import code.api.v5_1_0.OBPAPI5_1_0
 import code.api.{DirectLogin, _}
 import code.authtypevalidation.AuthenticationTypeValidationProvider
 import code.bankconnectors.Connector
@@ -4517,7 +4518,7 @@ object APIUtil extends MdcLoggable with CustomJsonFormats{
   
   val allowedAnswerTransactionRequestChallengeAttempts = APIUtil.getPropsAsIntValue("answer_transactionRequest_challenge_allowed_attempts").openOr(3)
   
-  lazy val allStaticResourceDocs = (OBPAPI5_0_0.allResourceDocs
+  lazy val allStaticResourceDocs = (OBPAPI5_1_0.allResourceDocs
     ++ OBP_UKOpenBanking_200.allResourceDocs
     ++ OBP_UKOpenBanking_310.allResourceDocs
     ++ code.api.Polish.v2_1_1_1.OBP_PAPI_2_1_1_1.allResourceDocs
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 ff3a035b1..99cabc263 100644
--- a/obp-api/src/main/scala/code/views/system/ViewDefinition.scala
+++ b/obp-api/src/main/scala/code/views/system/ViewDefinition.scala
@@ -1,7 +1,7 @@
 package code.views.system
 
 import code.api.util.APIUtil.{checkCustomViewIdOrName, checkSystemViewIdOrName}
-import code.api.util.ErrorMessages.{InvalidCustomViewFormat, InvalidSystemViewFormat}
+import code.api.util.ErrorMessages.{CreateSystemViewError, InvalidCustomViewFormat, InvalidSystemViewFormat}
 import code.util.{AccountIdString, UUIDString}
 import com.openbankproject.commons.model._
 import net.liftweb.common.Box
@@ -543,6 +543,11 @@ object ViewDefinition extends ViewDefinition with LongKeyedMetaMapper[ViewDefini
       if (!t.isSystem && !checkCustomViewIdOrName(t.view_id.get)) {
         throw new RuntimeException(InvalidCustomViewFormat+s"Current view_id (${t.view_id.get})")
       }
+      
+      //sanity checks
+      if (!t.isSystem && (t.bank_id ==null || t.account_id == null)) {
+        throw new RuntimeException(CreateSystemViewError+s"Current view.isSystem${t.isSystem}, bank_id${t.bank_id}, account_id${t.account_id}")
+      }
     }
   )