Index: src/app/qgswmssourceselect.cpp
===================================================================
--- src/app/qgswmssourceselect.cpp	(revision 15800)
+++ src/app/qgswmssourceselect.cpp	(working copy)
@@ -511,11 +511,18 @@
   QString crs;
   QString connInfo = connectionInfo();
 
+  QString connArgs;
+
   if ( lstTilesets->selectedItems().isEmpty() )
   {
     collectSelectedLayers( layers, styles );
     crs = mCRS;
     format = mFormats[ mImageFormatGroup->checkedId()];
+
+    if ( mTileWidth->text().toInt() > 0 && mTileHeight->text().toInt() > 0 )
+    {
+      connArgs = QString( "tiled=%1;%2" ).arg( mTileWidth->text().toInt() ).arg( mTileHeight->text().toInt() );
+    }
   }
   else
   {
@@ -525,11 +532,14 @@
     format = item->data( Qt::UserRole + 2 ).toString();
     crs    = item->data( Qt::UserRole + 3 ).toString();
 
-    QString connArgs = QString( "tiled=%1;%2;%3" )
-                       .arg( item->data( Qt::UserRole + 4 ).toInt() )
-                       .arg( item->data( Qt::UserRole + 5 ).toInt() )
-                       .arg( item->data( Qt::UserRole + 6 ).toStringList().join( ";" ) );
+    connArgs = QString( "tiled=%1;%2;%3" )
+               .arg( item->data( Qt::UserRole + 4 ).toInt() )
+               .arg( item->data( Qt::UserRole + 5 ).toInt() )
+               .arg( item->data( Qt::UserRole + 6 ).toStringList().join( ";" ) );
+  }
 
+  if ( !connArgs.isEmpty() )
+  {
     if ( connInfo.startsWith( "username=" ) || connInfo.startsWith( "ignoreUrl=" ) )
     {
       connInfo.prepend( connArgs + "," );
Index: src/providers/wms/qgswmsprovider.cpp
===================================================================
--- src/providers/wms/qgswmsprovider.cpp	(revision 15800)
+++ src/providers/wms/qgswmsprovider.cpp	(working copy)
@@ -545,22 +545,28 @@
   else
   {
     mTileReqNo++;
+
     double vres = viewExtent.width() / pixelWidth;
 
-    // find nearest resolution
+    double tres = vres;
     int i;
-    for ( i = 0; i < mResolutions.size() && mResolutions[i] < vres; i++ )
-      QgsDebugMsg( QString( "skipped res: %1:%2" ).arg( i ).arg( mResolutions[i] ) );
+    if ( mResolutions.size() > 0 )
+    {
 
-    if ( i == mResolutions.size() ||
-         ( i > 0 && vres - mResolutions[i-1] < mResolutions[i] - vres ) )
-    {
-      QgsDebugMsg( "back to previous res" );
-      i--;
+      // find nearest resolution
+      for ( i = 0; i < mResolutions.size() && mResolutions[i] < vres; i++ )
+        QgsDebugMsg( QString( "skipped res: %1:%2" ).arg( i ).arg( mResolutions[i] ) );
+
+      if ( i == mResolutions.size() ||
+           ( i > 0 && vres - mResolutions[i-1] < mResolutions[i] - vres ) )
+      {
+        QgsDebugMsg( "back to previous res" );
+        i--;
+      }
+
+      tres = mResolutions[i];
     }
 
-    double tres = mResolutions[i];
-
     // clip view extent to layer extent
     double xmin = qMax( viewExtent.xMinimum(), layerExtent.xMinimum() );
     double ymin = qMax( viewExtent.yMinimum(), layerExtent.yMinimum() );
@@ -2136,7 +2142,7 @@
     return false;
   }
 
-  if ( mTiled )
+  if ( mTiled && mResolutions.size() > 0 )
   {
     QString layers = activeSubLayers.join( "," );
     QString styles = activeSubStyles.join( "," );
Index: src/ui/qgswmssourceselectbase.ui
===================================================================
--- src/ui/qgswmssourceselectbase.ui	(revision 15800)
+++ src/ui/qgswmssourceselectbase.ui	(working copy)
@@ -182,8 +182,26 @@
          <property name="title">
           <string>Image encoding</string>
          </property>
+         <zorder>gbCRS</zorder>
         </widget>
        </item>
+       <item row="1" column="9">
+        <widget class="QPushButton" name="btnSave">
+         <property name="text">
+          <string>Save</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="8">
+        <widget class="QPushButton" name="btnLoad">
+         <property name="toolTip">
+          <string>Load connections from file</string>
+         </property>
+         <property name="text">
+          <string>Load</string>
+         </property>
+        </widget>
+       </item>
        <item row="4" column="0" colspan="12">
         <widget class="QGroupBox" name="gbCRS">
          <property name="title">
@@ -203,7 +221,7 @@
           <item row="0" column="1" colspan="2">
            <widget class="QLineEdit" name="leLayerName"/>
           </item>
-          <item row="1" column="0" colspan="2">
+          <item row="2" column="0" colspan="2">
            <widget class="QLabel" name="labelCoordRefSys">
             <property name="text">
              <string>Coordinate Reference System</string>
@@ -213,7 +231,7 @@
             </property>
            </widget>
           </item>
-          <item row="1" column="2">
+          <item row="2" column="2">
            <widget class="QPushButton" name="btnChangeSpatialRefSys">
             <property name="enabled">
              <bool>false</bool>
@@ -223,26 +241,30 @@
             </property>
            </widget>
           </item>
+          <item row="1" column="1">
+           <widget class="QLineEdit" name="mTileWidth">
+            <property name="inputMask">
+             <string>9999; </string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="label_2">
+            <property name="text">
+             <string>Tile size</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="2">
+           <widget class="QLineEdit" name="mTileHeight">
+            <property name="inputMask">
+             <string>9999; </string>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>
-       <item row="1" column="9">
-        <widget class="QPushButton" name="btnSave">
-         <property name="text">
-          <string>Save</string>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="8">
-        <widget class="QPushButton" name="btnLoad">
-         <property name="toolTip">
-          <string>Load connections from file</string>
-         </property>
-         <property name="text">
-          <string>Load</string>
-         </property>
-        </widget>
-       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tabLayerOrder">